Skip to content

Commit ab06588

Browse files
Merge remote-tracking branch 'origin/master' into release
2 parents 7bb7dd1 + e9e84f9 commit ab06588

File tree

72 files changed

+3378
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3378
-440
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.7'
3+
s.version = '21.8'
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' }

Examples/AcceptAllRevisions.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import AsposeWordsCloud
22

3-
let currentDir = ...
43
let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
54
let api = WordsAPI(configuration: config);
65
let fileName = "test_doc.docx";
76

87
// Upload original document to cloud storage.
9-
let uploadFileRequest = UploadFileRequest(fileContent: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!, path: fileName);
8+
let myVar1 = InputStream(url: URL(string: fileName))!;
9+
let myVar2 = fileName;
10+
let uploadFileRequest = UploadFileRequest(fileContent: myVar1, path: myVar2);
1011
_ = try api.uploadFile(request: uploadFileRequest);
1112

1213
// Calls AcceptAllRevisions method for document in cloud.
13-
let request = AcceptAllRevisionsRequest(name: fileName);
14+
let myVar3 = fileName;
15+
let request = AcceptAllRevisionsRequest(name: myVar3);
1416
_ = try api.acceptAllRevisions(request: request);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
let currentDir = ...
21
let config = Configuration(clientId: "####-####-####-####-####", clientSecret: "##################");
32
let api = WordsAPI(configuration: config);
43
let fileName = "test_doc.docx";
54

65
// Calls AcceptAllRevisionsOnline method for document in cloud.
7-
let request = AcceptAllRevisionsOnlineRequest(document: InputStream(url: currentDir!.appendingPathComponent(fileName, isDirectory: false))!);
6+
let requestDocument = InputStream(url: URL(string: fileName))!;
7+
let request = AcceptAllRevisionsOnlineRequest(document: requestDocument);
88
let acceptAllRevisionsOnlineResult = try api.acceptAllRevisionsOnline(request: request);
99
try acceptAllRevisionsOnlineResult.getDocument()?.write(to: currentDir!.appendingPathComponent("test_result.docx", isDirectory: false));

Jenkinsfile

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,47 @@ def needToBuild = false
1414

1515
node('words-linux') {
1616
cleanWs()
17-
if (!params.branch.contains("release")) {
18-
dir('swift') {
19-
try {
20-
stage('checkout'){
21-
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']]])
22-
23-
sh 'git show -s HEAD > gitMessage'
24-
def commitMessage = readFile('gitMessage').trim()
25-
echo commitMessage
26-
needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')
27-
sh 'git clean -fdx'
28-
29-
if (needToBuild) {
30-
withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
31-
sh 'mkdir -p Settings'
32-
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
33-
}
17+
dir('swift') {
18+
try {
19+
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']]])
21+
22+
sh 'git show -s HEAD > gitMessage'
23+
def commitMessage = readFile('gitMessage').trim()
24+
echo commitMessage
25+
needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')
26+
sh 'git clean -fdx'
27+
28+
if (needToBuild) {
29+
withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
30+
sh 'mkdir -p Settings'
31+
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
3432
}
3533
}
34+
}
35+
36+
if (needToBuild) {
37+
docker.image('swift:5.0').inside{
38+
stage('build'){
39+
sh "swift build"
40+
}
3641

37-
if (needToBuild) {
38-
docker.image('swift:5.0').inside{
39-
stage('build'){
40-
sh "swift build"
42+
stage('tests'){
43+
try{
44+
sh "chmod +x ./Scripts/runTests.sh"
45+
sh "./Scripts/runTests.sh"
46+
} finally{
47+
junit 'tests.xml'
4148
}
49+
}
4250

43-
stage('tests'){
44-
try{
45-
sh "chmod +x ./Scripts/runTests.sh"
46-
sh "./Scripts/runTests.sh"
47-
} finally{
48-
junit 'tests.xml'
49-
}
50-
}
51-
52-
stage('clean-compiled'){
53-
sh "rm -rf %s"
54-
}
55-
}
56-
}
57-
} finally {
58-
deleteDir()
51+
stage('clean-compiled'){
52+
sh "rm -rf %s"
53+
}
54+
}
5955
}
56+
} finally {
57+
deleteDir()
6058
}
6159
}
6260
}

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ 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.8
17+
18+
- Added new api methods to get, insert, update or delete custom xml parts from documents.
19+
- Added parameter 'ResultDocumentFormat' to Compare API
20+
- Added 'ExportLanguageToSpanTag' pdf save option
21+
- Added 'FlatOpcXmlMappingOnly' save option
22+
23+
1624
## Enhancements in Version 21.7
1725

1826
- ImlRenderingMode option introduced witch is used to determine how ink (InkML) objects are rendered
@@ -150,7 +158,7 @@ Add link to this repository as dependency to your Package.swift:
150158

151159
dependencies: [
152160
// Dependencies declare other packages that this package depends on.
153-
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.7"),
161+
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.8"),
154162
],
155163
targets: [
156164
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -168,7 +176,7 @@ targets: [
168176
Add link to git repository as dependency to your Podfile:
169177

170178
```ruby
171-
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.7'
179+
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.8'
172180
```
173181

174182
## Getting Started

Sources/AsposeWordsCloud/Api/Configuration.swift

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

118118
// Returns SDK version for using in statistics headers
119119
public func getSdkVersion() -> String {
120-
return "21.7";
120+
return "21.8";
121121
}
122122
}

0 commit comments

Comments
 (0)