Skip to content

Commit 78fd382

Browse files
radazzouzradazzouz
authored
Merge pull request #7 from PSPDFKit/rad/update-for-8.3.0
Update for PSPDFKit 8.3 for iOS, PSPDFKit 3.3.0 for macOS, Xcode 10.2 and Xcode 10.2
2 parents 78c6487 + 4478572 commit 78fd382

File tree

9 files changed

+83
-75
lines changed

9 files changed

+83
-75
lines changed

‎Example/PSPDFKitExample/PSPDFKitExample.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
75727C4A2020AB65008F281F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75727C482020AB65008F281F /* Main.storyboard */; };
1313
75727C4C2020AB65008F281F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75727C4B2020AB65008F281F /* Assets.xcassets */; };
1414
75727C4F2020AB65008F281F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75727C4D2020AB65008F281F /* LaunchScreen.storyboard */; };
15-
8CB46CC0F9AA6CAAE67536E1 /* Pods_PSPDFKitExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */; };
15+
93385DB0026E483DB8248497 /* Pods_PSPDFKitExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXCopyFilesBuildPhase section */
@@ -29,46 +29,47 @@
2929
/* End PBXCopyFilesBuildPhase section */
3030

3131
/* Begin PBXFileReference section */
32-
03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PSPDFKitExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
33-
1AE6B5BAE9EFA818FECEAAF6 /* Pods-PSPDFKitExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PSPDFKitExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample.debug.xcconfig"; sourceTree = "<group>"; };
34-
31C7A22C23CD5FDE7EB0CC31 /* Pods-PSPDFKitExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PSPDFKitExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample.release.xcconfig"; sourceTree = "<group>"; };
32+
64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PSPDFKitExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3533
75727C412020AB65008F281F /* PSPDFKitExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PSPDFKitExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3634
75727C442020AB65008F281F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3735
75727C462020AB65008F281F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3836
75727C492020AB65008F281F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
3937
75727C4B2020AB65008F281F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4038
75727C4E2020AB65008F281F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4139
75727C502020AB65008F281F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
40+
90CD6E9211E7793D6DE6DB55 /* Pods-PSPDFKitExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PSPDFKitExample.debug.xcconfig"; path = "Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample.debug.xcconfig"; sourceTree = "<group>"; };
41+
FD122082E4CE60877B290D84 /* Pods-PSPDFKitExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PSPDFKitExample.release.xcconfig"; path = "Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample.release.xcconfig"; sourceTree = "<group>"; };
4242
/* End PBXFileReference section */
4343

4444
/* Begin PBXFrameworksBuildPhase section */
4545
75727C3E2020AB65008F281F /* Frameworks */ = {
4646
isa = PBXFrameworksBuildPhase;
4747
buildActionMask = 2147483647;
4848
files = (
49-
8CB46CC0F9AA6CAAE67536E1 /* Pods_PSPDFKitExample.framework in Frameworks */,
49+
93385DB0026E483DB8248497 /* Pods_PSPDFKitExample.framework in Frameworks */,
5050
);
5151
runOnlyForDeploymentPostprocessing = 0;
5252
};
5353
/* End PBXFrameworksBuildPhase section */
5454

5555
/* Begin PBXGroup section */
56-
0C696CE6A3B71705DAB8F2E4 /* Pods */ = {
56+
026B91F1BE70994A16CD62A1 /* Pods */ = {
5757
isa = PBXGroup;
5858
children = (
59-
1AE6B5BAE9EFA818FECEAAF6 /* Pods-PSPDFKitExample.debug.xcconfig */,
60-
31C7A22C23CD5FDE7EB0CC31 /* Pods-PSPDFKitExample.release.xcconfig */,
59+
90CD6E9211E7793D6DE6DB55 /* Pods-PSPDFKitExample.debug.xcconfig */,
60+
FD122082E4CE60877B290D84 /* Pods-PSPDFKitExample.release.xcconfig */,
6161
);
6262
name = Pods;
63+
path = Pods;
6364
sourceTree = "<group>";
6465
};
6566
75727C382020AB65008F281F = {
6667
isa = PBXGroup;
6768
children = (
6869
75727C432020AB65008F281F /* PSPDFKitExample */,
6970
75727C422020AB65008F281F /* Products */,
70-
0C696CE6A3B71705DAB8F2E4 /* Pods */,
71-
B4B32F7C34CA062D816ADCE1 /* Frameworks */,
71+
026B91F1BE70994A16CD62A1 /* Pods */,
72+
DF1CA85A6DF91B1D5FB6E701 /* Frameworks */,
7273
);
7374
sourceTree = "<group>";
7475
};
@@ -93,10 +94,10 @@
9394
path = PSPDFKitExample;
9495
sourceTree = "<group>";
9596
};
96-
B4B32F7C34CA062D816ADCE1 /* Frameworks */ = {
97+
DF1CA85A6DF91B1D5FB6E701 /* Frameworks */ = {
9798
isa = PBXGroup;
9899
children = (
99-
03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */,
100+
64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */,
100101
);
101102
name = Frameworks;
102103
sourceTree = "<group>";
@@ -108,12 +109,12 @@
108109
isa = PBXNativeTarget;
109110
buildConfigurationList = 75727C532020AB65008F281F /* Build configuration list for PBXNativeTarget "PSPDFKitExample" */;
110111
buildPhases = (
111-
14629D979CE71EB0E919D35C /* [CP] Check Pods Manifest.lock */,
112+
AF1BADD7FE7873038A5A0D14 /* [CP] Check Pods Manifest.lock */,
112113
75727C3D2020AB65008F281F /* Sources */,
113114
75727C3E2020AB65008F281F /* Frameworks */,
114115
75727C3F2020AB65008F281F /* Resources */,
115116
755CAFE520231A1B004EC6F8 /* Embed Frameworks */,
116-
0AF67CE7639C8DB92A280A86 /* [CP] Embed Pods Frameworks */,
117+
FF46A443CBE9C9858093AF9D /* [CP] Embed Pods Frameworks */,
117118
);
118119
buildRules = (
119120
);
@@ -131,12 +132,12 @@
131132
isa = PBXProject;
132133
attributes = {
133134
LastSwiftUpdateCheck = 0920;
134-
LastUpgradeCheck = 0920;
135+
LastUpgradeCheck = 1020;
135136
ORGANIZATIONNAME = PSPDFKit;
136137
TargetAttributes = {
137138
75727C402020AB65008F281F = {
138139
CreatedOnToolsVersion = 9.2;
139-
LastSwiftMigration = 1000;
140+
LastSwiftMigration = 1020;
140141
ProvisioningStyle = Automatic;
141142
};
142143
};
@@ -173,56 +174,56 @@
173174
/* End PBXResourcesBuildPhase section */
174175

175176
/* Begin PBXShellScriptBuildPhase section */
176-
0AF67CE7639C8DB92A280A86 /* [CP] Embed Pods Frameworks */ = {
177+
AF1BADD7FE7873038A5A0D14 /* [CP] Check Pods Manifest.lock */ = {
177178
isa = PBXShellScriptBuildPhase;
178179
buildActionMask = 2147483647;
179180
files = (
180181
);
181182
inputFileListPaths = (
182183
);
183184
inputPaths = (
184-
"${SRCROOT}/Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh",
185-
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework",
186-
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework.dSYM",
187-
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework",
188-
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework.dSYM",
189-
"${BUILT_PRODUCTS_DIR}/PSPDFKitSwift/PSPDFKitSwift.framework",
185+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
186+
"${PODS_ROOT}/Manifest.lock",
190187
);
191-
name = "[CP] Embed Pods Frameworks";
188+
name = "[CP] Check Pods Manifest.lock";
192189
outputFileListPaths = (
193190
);
194191
outputPaths = (
195-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework",
196-
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKit.framework.dSYM",
197-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework",
198-
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKitUI.framework.dSYM",
199-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitSwift.framework",
192+
"$(DERIVED_FILE_DIR)/Pods-PSPDFKitExample-checkManifestLockResult.txt",
200193
);
201194
runOnlyForDeploymentPostprocessing = 0;
202195
shellPath = /bin/sh;
203-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh\"\n";
196+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
204197
showEnvVarsInLog = 0;
205198
};
206-
14629D979CE71EB0E919D35C /* [CP] Check Pods Manifest.lock */ = {
199+
FF46A443CBE9C9858093AF9D /* [CP] Embed Pods Frameworks */ = {
207200
isa = PBXShellScriptBuildPhase;
208201
buildActionMask = 2147483647;
209202
files = (
210203
);
211204
inputFileListPaths = (
212205
);
213206
inputPaths = (
214-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
215-
"${PODS_ROOT}/Manifest.lock",
207+
"${PODS_ROOT}/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh",
208+
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework",
209+
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework.dSYM",
210+
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework",
211+
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework.dSYM",
212+
"${BUILT_PRODUCTS_DIR}/PSPDFKitSwift/PSPDFKitSwift.framework",
216213
);
217-
name = "[CP] Check Pods Manifest.lock";
214+
name = "[CP] Embed Pods Frameworks";
218215
outputFileListPaths = (
219216
);
220217
outputPaths = (
221-
"$(DERIVED_FILE_DIR)/Pods-PSPDFKitExample-checkManifestLockResult.txt",
218+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework",
219+
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKit.framework.dSYM",
220+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework",
221+
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKitUI.framework.dSYM",
222+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitSwift.framework",
222223
);
223224
runOnlyForDeploymentPostprocessing = 0;
224225
shellPath = /bin/sh;
225-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
226+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh\"\n";
226227
showEnvVarsInLog = 0;
227228
};
228229
/* End PBXShellScriptBuildPhase section */
@@ -273,13 +274,15 @@
273274
CLANG_WARN_BOOL_CONVERSION = YES;
274275
CLANG_WARN_COMMA = YES;
275276
CLANG_WARN_CONSTANT_CONVERSION = YES;
277+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
276278
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
277279
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
278280
CLANG_WARN_EMPTY_BODY = YES;
279281
CLANG_WARN_ENUM_CONVERSION = YES;
280282
CLANG_WARN_INFINITE_RECURSION = YES;
281283
CLANG_WARN_INT_CONVERSION = YES;
282284
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
285+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
283286
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
284287
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
285288
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -330,13 +333,15 @@
330333
CLANG_WARN_BOOL_CONVERSION = YES;
331334
CLANG_WARN_COMMA = YES;
332335
CLANG_WARN_CONSTANT_CONVERSION = YES;
336+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
333337
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
334338
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
335339
CLANG_WARN_EMPTY_BODY = YES;
336340
CLANG_WARN_ENUM_CONVERSION = YES;
337341
CLANG_WARN_INFINITE_RECURSION = YES;
338342
CLANG_WARN_INT_CONVERSION = YES;
339343
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
344+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
340345
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
341346
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
342347
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -368,28 +373,28 @@
368373
};
369374
75727C542020AB65008F281F /* Debug */ = {
370375
isa = XCBuildConfiguration;
371-
baseConfigurationReference = 1AE6B5BAE9EFA818FECEAAF6 /* Pods-PSPDFKitExample.debug.xcconfig */;
376+
baseConfigurationReference = 90CD6E9211E7793D6DE6DB55 /* Pods-PSPDFKitExample.debug.xcconfig */;
372377
buildSettings = {
373378
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
374379
CODE_SIGN_STYLE = Automatic;
375380
INFOPLIST_FILE = PSPDFKitExample/Info.plist;
376381
PRODUCT_BUNDLE_IDENTIFIER = com.pspdfkit.PSPDFKitExample;
377382
PRODUCT_NAME = "$(TARGET_NAME)";
378-
SWIFT_VERSION = 4.2;
383+
SWIFT_VERSION = 5.0;
379384
TARGETED_DEVICE_FAMILY = "1,2";
380385
};
381386
name = Debug;
382387
};
383388
75727C552020AB65008F281F /* Release */ = {
384389
isa = XCBuildConfiguration;
385-
baseConfigurationReference = 31C7A22C23CD5FDE7EB0CC31 /* Pods-PSPDFKitExample.release.xcconfig */;
390+
baseConfigurationReference = FD122082E4CE60877B290D84 /* Pods-PSPDFKitExample.release.xcconfig */;
386391
buildSettings = {
387392
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
388393
CODE_SIGN_STYLE = Automatic;
389394
INFOPLIST_FILE = PSPDFKitExample/Info.plist;
390395
PRODUCT_BUNDLE_IDENTIFIER = com.pspdfkit.PSPDFKitExample;
391396
PRODUCT_NAME = "$(TARGET_NAME)";
392-
SWIFT_VERSION = 4.2;
397+
SWIFT_VERSION = 5.0;
393398
TARGETED_DEVICE_FAMILY = "1,2";
394399
};
395400
name = Release;

‎Example/PSPDFKitExample/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
platform :ios, '11.0'
99
use_frameworks!
1010

11-
pod 'PSPDFKitSwift', :git => 'https://github.com/PSPDFKit/PSPDFKit.swift.git', :tag => '1.1.2'
11+
pod 'PSPDFKitSwift', :git => 'https://github.com/PSPDFKit/PSPDFKit.swift.git', :tag => '1.1.3'
1212

1313
target 'PSPDFKitExample' do
1414

0 commit comments

Comments
 (0)