Skip to content

Commit b5e3f86

Browse files
andrey-kotlyarovandrey-kotlyarov
authored
Merge pull request #26 from kaferi/master
Update to v20.6
2 parents 39aaac5 + de6f971 commit b5e3f86

28 files changed

+122
-49
lines changed

‎AsposePdfCloud.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.ios.deployment_target = '10.0'
66
s.osx.deployment_target = '10.11'
77
s.tvos.deployment_target = '9.0'
8-
s.version = '20.5.0'
8+
s.version = '20.6.0'
99
s.swift_version = '4.1'
1010
s.source = { :git => 'https://github.com/aspose-pdf-cloud/aspose-pdf-cloud-swift.git', :tag => s.version.to_s }
1111
s.authors = 'Aspose PDF Cloud'

‎AsposePdfCloud.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
122D5DF723CE1C8300D9E42E /* ListBoxFieldResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 122D5DE823CE1C8200D9E42E /* ListBoxFieldResponse.swift */; };
2323
122D5DF823CE1C8300D9E42E /* ListBoxFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = 122D5DE923CE1C8200D9E42E /* ListBoxFields.swift */; };
2424
122D5DF923CE1C8300D9E42E /* Direction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 122D5DEA23CE1C8200D9E42E /* Direction.swift */; };
25+
125B282224A23A8D001CAB84 /* OutputFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125B282124A23A8C001CAB84 /* OutputFormat.swift */; };
2526
125EF5CA236C7E1D0013E682 /* CheckBoxFieldResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125EF5C4236C7E1C0013E682 /* CheckBoxFieldResponse.swift */; };
2627
125EF5CB236C7E1D0013E682 /* CheckBoxFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125EF5C5236C7E1D0013E682 /* CheckBoxFields.swift */; };
2728
125EF5CC236C7E1D0013E682 /* CheckBoxFieldsResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 125EF5C6236C7E1D0013E682 /* CheckBoxFieldsResponse.swift */; };
@@ -425,6 +426,7 @@
425426
122D5DE823CE1C8200D9E42E /* ListBoxFieldResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListBoxFieldResponse.swift; sourceTree = "<group>"; };
426427
122D5DE923CE1C8200D9E42E /* ListBoxFields.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListBoxFields.swift; sourceTree = "<group>"; };
427428
122D5DEA23CE1C8200D9E42E /* Direction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Direction.swift; sourceTree = "<group>"; };
429+
125B282124A23A8C001CAB84 /* OutputFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutputFormat.swift; sourceTree = "<group>"; };
428430
125EF5C4236C7E1C0013E682 /* CheckBoxFieldResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckBoxFieldResponse.swift; sourceTree = "<group>"; };
429431
125EF5C5236C7E1D0013E682 /* CheckBoxFields.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckBoxFields.swift; sourceTree = "<group>"; };
430432
125EF5C6236C7E1D0013E682 /* CheckBoxFieldsResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckBoxFieldsResponse.swift; sourceTree = "<group>"; };
@@ -860,6 +862,7 @@
860862
1E668AE72174AFC2004218A8 /* Models */ = {
861863
isa = PBXGroup;
862864
children = (
865+
125B282124A23A8C001CAB84 /* OutputFormat.swift */,
863866
1278CC972444B50900AACF09 /* ImageFragment.swift */,
864867
1E668B072174AFF2004218A8 /* Annotation.swift */,
865868
1E668B1C2174AFF4004218A8 /* AnnotationFlags.swift */,
@@ -1659,6 +1662,7 @@
16591662
1ECF708622562DCE0056698E /* TablesRecognizedResponse.swift in Sources */,
16601663
1E668B672174AFFC004218A8 /* Attachments.swift in Sources */,
16611664
122D5DF823CE1C8300D9E42E /* ListBoxFields.swift in Sources */,
1665+
125B282224A23A8D001CAB84 /* OutputFormat.swift in Sources */,
16621666
1E9D85C221B55DF50026DB97 /* UnderlineAnnotation.swift in Sources */,
16631667
1EF1EC21220B3BF000200CEF /* FileAttachmentAnnotation.swift in Sources */,
16641668
1E668B682174AFFC004218A8 /* TextAnnotationResponse.swift in Sources */,
@@ -2009,7 +2013,7 @@
20092013
"@executable_path/Frameworks",
20102014
"@loader_path/Frameworks",
20112015
);
2012-
MARKETING_VERSION = 20.5.0;
2016+
MARKETING_VERSION = 20.6.0;
20132017
PRODUCT_BUNDLE_IDENTIFIER = com.aspose.AsposePdfCloud;
20142018
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
20152019
SKIP_INSTALL = YES;
@@ -2038,7 +2042,7 @@
20382042
"@executable_path/Frameworks",
20392043
"@loader_path/Frameworks",
20402044
);
2041-
MARKETING_VERSION = 20.5.0;
2045+
MARKETING_VERSION = 20.6.0;
20422046
PRODUCT_BUNDLE_IDENTIFIER = com.aspose.AsposePdfCloud;
20432047
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
20442048
SKIP_INSTALL = YES;

‎AsposePdfCloud/APIs.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ open class RequestBuilder<T> {
5151
//OAuth2.0
5252
_ = addHeader(name: "Authorization", value: "Bearer " + AsposePdfCloudAPI.accessToken!)
5353
.addHeader(name: "x-aspose-client", value: "swift sdk")
54-
.addHeader(name: "x-aspose-client-version", value: "20.5.0")
54+
.addHeader(name: "x-aspose-client-version", value: "20.6.0")
5555
}
5656

5757
open func addHeaders(_ aHeaders:[String:String]) {

‎AsposePdfCloud/APIs/PdfAPI.swift

Lines changed: 14 additions & 8 deletions
Large diffs are not rendered by default.

‎AsposePdfCloud/Models/CheckBoxField.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ open class CheckBoxField: FormField {
4141
public var exportValue: String?
4242

4343

44-
public init(links: [Link]?, partialName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, allowedStates: [String]?, style: BoxStyle?, activeState: String?, checked: Bool, exportValue: String?) {
44+
public init(links: [Link]?, partialName: String?, fullName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, allowedStates: [String]?, style: BoxStyle?, activeState: String?, checked: Bool, exportValue: String?) {
4545
self.checked = checked
46-
super.init(links: links, partialName: partialName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border)
46+
super.init(links: links, partialName: partialName, fullName: fullName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border)
4747
self.allowedStates = allowedStates
4848
self.style = style
4949
self.activeState = activeState

‎AsposePdfCloud/Models/ChoiceField.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ open class ChoiceField: FormField {
3535
public var selected: Int?
3636

3737

38-
public init(links: [Link]?, partialName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?) {
39-
super.init(links: links, partialName: partialName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border)
38+
public init(links: [Link]?, partialName: String?, fullName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?) {
39+
super.init(links: links, partialName: partialName, fullName: fullName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border)
4040
self.multiSelect = multiSelect
4141
self.selected = selected
4242
}

‎AsposePdfCloud/Models/ComboBoxField.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ open class ComboBoxField: ChoiceField {
3939
public var spellCheck: Bool?
4040

4141

42-
public init(links: [Link]?, partialName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?, options: [Option]?, activeState: String?, editable: Bool?, spellCheck: Bool?) {
43-
super.init(links: links, partialName: partialName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border, multiSelect: multiSelect, selected: selected)
42+
public init(links: [Link]?, partialName: String?, fullName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?, options: [Option]?, activeState: String?, editable: Bool?, spellCheck: Bool?) {
43+
super.init(links: links, partialName: partialName, fullName: fullName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border, multiSelect: multiSelect, selected: selected)
4444
self.options = options
4545
self.activeState = activeState
4646
self.editable = editable

‎AsposePdfCloud/Models/FormField.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ open class FormField: LinkElement {
3131

3232
/** Field name. */
3333
public var partialName: String?
34+
/** Full Field name. */
35+
public var fullName: String?
3436
/** Field rectangle. */
3537
public var rect: Rectangle?
3638
/** Field value. */
@@ -67,10 +69,11 @@ open class FormField: LinkElement {
6769
public var border: Border?
6870

6971

70-
public init(links: [Link]?, partialName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?) {
72+
public init(links: [Link]?, partialName: String?, fullName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?) {
7173
self.pageIndex = pageIndex
7274
super.init(links: links)
7375
self.partialName = partialName
76+
self.fullName = fullName
7477
self.rect = rect
7578
self.value = value
7679
self.height = height
@@ -98,6 +101,7 @@ open class FormField: LinkElement {
98101
var container = encoder.container(keyedBy: String.self)
99102

100103
try container.encodeIfPresent(partialName, forKey: "PartialName")
104+
try container.encodeIfPresent(fullName, forKey: "FullName")
101105
try container.encodeIfPresent(rect, forKey: "Rect")
102106
try container.encodeIfPresent(value, forKey: "Value")
103107
try container.encode(pageIndex, forKey: "PageIndex")
@@ -124,6 +128,7 @@ open class FormField: LinkElement {
124128
let container = try decoder.container(keyedBy: String.self)
125129

126130
partialName = try container.decodeIfPresent(String.self, forKey: "PartialName")
131+
fullName = try container.decodeIfPresent(String.self, forKey: "FullName")
127132
rect = try container.decodeIfPresent(Rectangle.self, forKey: "Rect")
128133
value = try container.decodeIfPresent(String.self, forKey: "Value")
129134
pageIndex = try container.decode(Int.self, forKey: "PageIndex")

‎AsposePdfCloud/Models/ListBoxField.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ open class ListBoxField: ChoiceField {
3939
public var selectedItems: [Int]?
4040

4141

42-
public init(links: [Link]?, partialName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?, options: [Option]?, activeState: String?, topIndex: Int?, selectedItems: [Int]?) {
43-
super.init(links: links, partialName: partialName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border, multiSelect: multiSelect, selected: selected)
42+
public init(links: [Link]?, partialName: String?, fullName: String?, rect: Rectangle?, value: String?, pageIndex: Int, height: Double?, width: Double?, zIndex: Int?, isGroup: Bool?, parent: FormField?, isSharedField: Bool?, flags: [AnnotationFlags]?, color: Color?, contents: String?, margin: MarginInfo?, highlighting: LinkHighlightingMode?, horizontalAlignment: HorizontalAlignment?, verticalAlignment: VerticalAlignment?, border: Border?, multiSelect: Bool?, selected: Int?, options: [Option]?, activeState: String?, topIndex: Int?, selectedItems: [Int]?) {
43+
super.init(links: links, partialName: partialName, fullName: fullName, rect: rect, value: value, pageIndex: pageIndex, height: height, width: width, zIndex: zIndex, isGroup: isGroup, parent: parent, isSharedField: isSharedField, flags: flags, color: color, contents: contents, margin: margin, highlighting: highlighting, horizontalAlignment: horizontalAlignment, verticalAlignment: verticalAlignment, border: border, multiSelect: multiSelect, selected: selected)
4444
self.options = options
4545
self.activeState = activeState
4646
self.topIndex = topIndex

‎AsposePdfCloud/Models/OutputFormat.swift

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/**
2+
*
3+
* Copyright (c) 2020 Aspose.PDF Cloud
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
* The above copyright notice and this permission notice shall be included in all
11+
* copies or substantial portions of the Software.
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
17+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
18+
* SOFTWARE.
19+
*
20+
*/
21+
22+
23+
24+
25+
import Foundation
26+
27+
28+
/** Enumeration for output type format. */
29+
public enum OutputFormat: String, Codable {
30+
case zip = "Zip"
31+
case folder = "Folder"
32+
33+
}

0 commit comments

Comments
 (0)