diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index 7769c3c..2604cc8 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -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"; @@ -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"; diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index d596f7c..48fcda3 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -20,8 +20,7 @@ #include #include -#include -#include +#include @implementation CoreWrapper { std::optional document; diff --git a/Podfile.lock b/Podfile.lock index 13d6627..68fcc5d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -202,4 +202,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6720582fdcdb802ca92989bb0bebf8878e20bc55 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/conan/conanfile.py b/conan/conanfile.py index e30ab6e..a3b4bbe 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -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)