Skip to content

Commit

Permalink
Merge pull request #7 from PSPDFKit/rad/update-for-8.3.0
Browse files Browse the repository at this point in the history 
Update for PSPDFKit 8.3 for iOS, PSPDFKit 3.3.0 for macOS, Xcode 10.2 and Xcode 10.2
  • Loading branch information
@radazzouz
radazzouz authored Apr 23, 2019
2 parents 78c6487 + 4478572 commit 78fd382
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 75 deletions.
85 changes: 45 additions & 40 deletions Example/PSPDFKitExample/PSPDFKitExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
75727C4A2020AB65008F281F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75727C482020AB65008F281F /* Main.storyboard */; };
75727C4C2020AB65008F281F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75727C4B2020AB65008F281F /* Assets.xcassets */; };
75727C4F2020AB65008F281F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 75727C4D2020AB65008F281F /* LaunchScreen.storyboard */; };
8CB46CC0F9AA6CAAE67536E1 /* Pods_PSPDFKitExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */; };
93385DB0026E483DB8248497 /* Pods_PSPDFKitExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -29,46 +29,47 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PSPDFKitExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
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>"; };
64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PSPDFKitExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
75727C412020AB65008F281F /* PSPDFKitExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PSPDFKitExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
75727C442020AB65008F281F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
75727C462020AB65008F281F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
75727C492020AB65008F281F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
75727C4B2020AB65008F281F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
75727C4E2020AB65008F281F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
75727C502020AB65008F281F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
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>"; };
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>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
75727C3E2020AB65008F281F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8CB46CC0F9AA6CAAE67536E1 /* Pods_PSPDFKitExample.framework in Frameworks */,
93385DB0026E483DB8248497 /* Pods_PSPDFKitExample.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0C696CE6A3B71705DAB8F2E4 /* Pods */ = {
026B91F1BE70994A16CD62A1 /* Pods */ = {
isa = PBXGroup;
children = (
1AE6B5BAE9EFA818FECEAAF6 /* Pods-PSPDFKitExample.debug.xcconfig */,
31C7A22C23CD5FDE7EB0CC31 /* Pods-PSPDFKitExample.release.xcconfig */,
90CD6E9211E7793D6DE6DB55 /* Pods-PSPDFKitExample.debug.xcconfig */,
FD122082E4CE60877B290D84 /* Pods-PSPDFKitExample.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
75727C382020AB65008F281F = {
isa = PBXGroup;
children = (
75727C432020AB65008F281F /* PSPDFKitExample */,
75727C422020AB65008F281F /* Products */,
0C696CE6A3B71705DAB8F2E4 /* Pods */,
B4B32F7C34CA062D816ADCE1 /* Frameworks */,
026B91F1BE70994A16CD62A1 /* Pods */,
DF1CA85A6DF91B1D5FB6E701 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -93,10 +94,10 @@
path = PSPDFKitExample;
sourceTree = "<group>";
};
B4B32F7C34CA062D816ADCE1 /* Frameworks */ = {
DF1CA85A6DF91B1D5FB6E701 /* Frameworks */ = {
isa = PBXGroup;
children = (
03F2D26755CF77B2C1BC253C /* Pods_PSPDFKitExample.framework */,
64025490845FFBBD99B65C25 /* Pods_PSPDFKitExample.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -108,12 +109,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 75727C532020AB65008F281F /* Build configuration list for PBXNativeTarget "PSPDFKitExample" */;
buildPhases = (
14629D979CE71EB0E919D35C /* [CP] Check Pods Manifest.lock */,
AF1BADD7FE7873038A5A0D14 /* [CP] Check Pods Manifest.lock */,
75727C3D2020AB65008F281F /* Sources */,
75727C3E2020AB65008F281F /* Frameworks */,
75727C3F2020AB65008F281F /* Resources */,
755CAFE520231A1B004EC6F8 /* Embed Frameworks */,
0AF67CE7639C8DB92A280A86 /* [CP] Embed Pods Frameworks */,
FF46A443CBE9C9858093AF9D /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -131,12 +132,12 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = PSPDFKit;
TargetAttributes = {
75727C402020AB65008F281F = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -173,56 +174,56 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0AF67CE7639C8DB92A280A86 /* [CP] Embed Pods Frameworks */ = {
AF1BADD7FE7873038A5A0D14 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh",
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework",
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework.dSYM",
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework",
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/PSPDFKitSwift/PSPDFKitSwift.framework",
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Embed Pods Frameworks";
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework",
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKit.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework",
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKitUI.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitSwift.framework",
"$(DERIVED_FILE_DIR)/Pods-PSPDFKitExample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh\"\n";
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";
showEnvVarsInLog = 0;
};
14629D979CE71EB0E919D35C /* [CP] Check Pods Manifest.lock */ = {
FF46A443CBE9C9858093AF9D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
"${PODS_ROOT}/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh",
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework",
"${PODS_ROOT}/PSPDFKit/PSPDFKit.framework.dSYM",
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework",
"${PODS_ROOT}/PSPDFKit/PSPDFKitUI.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/PSPDFKitSwift/PSPDFKitSwift.framework",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-PSPDFKitExample-checkManifestLockResult.txt",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKit.framework",
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKit.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitUI.framework",
"${DWARF_DSYM_FOLDER_PATH}/PSPDFKitUI.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PSPDFKitSwift.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PSPDFKitExample/Pods-PSPDFKitExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -273,13 +274,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -330,13 +333,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -368,28 +373,28 @@
};
75727C542020AB65008F281F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1AE6B5BAE9EFA818FECEAAF6 /* Pods-PSPDFKitExample.debug.xcconfig */;
baseConfigurationReference = 90CD6E9211E7793D6DE6DB55 /* Pods-PSPDFKitExample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = PSPDFKitExample/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.pspdfkit.PSPDFKitExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
75727C552020AB65008F281F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 31C7A22C23CD5FDE7EB0CC31 /* Pods-PSPDFKitExample.release.xcconfig */;
baseConfigurationReference = FD122082E4CE60877B290D84 /* Pods-PSPDFKitExample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = PSPDFKitExample/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.pspdfkit.PSPDFKitExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Example/PSPDFKitExample/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
platform :ios, '11.0'
use_frameworks!

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

target 'PSPDFKitExample' do

Expand Down
Loading

0 comments on commit 78fd382

Please sign in to comment.