Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions OpenDocumentReader.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -452,14 +452,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks.sh\"\n";
Expand All @@ -473,14 +469,10 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-resources.sh\"\n";
Expand Down
3 changes: 1 addition & 2 deletions OpenDocumentReader/CoreWrapper.mm
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

#include <string>
#include <optional>
#include <string>
#include <optional>
#include <iostream>

@implementation CoreWrapper {
std::optional<odr::Document> document;
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 6720582fdcdb802ca92989bb0bebf8878e20bc55

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
3 changes: 2 additions & 1 deletion conan/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ class Pkg(ConanFile):
"odrcore/*:shared": False,
"odrcore/*:with_pdf2htmlEX": False,
"odrcore/*:with_wvWare": False,
"odrcore/*:with_libmagic": False,
}
requires = "odrcore/5.0.0"
requires = "odrcore/5.2.0"

def generate(self):
xcode = XcodeDeps(self)
Expand Down