Skip to content

Commit fafdc22

Browse files
andiwandandiwand
authored
fix build (#81)
1 parent bf09af2 commit fafdc22

6 files changed

Lines changed: 20 additions & 21 deletions

File tree

‎.github/workflows/ios_main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ jobs:
88
steps:
99
- name: checkout
1010
uses: actions/checkout@v2
11-
with:
12-
token: ${{ secrets.PAT_TOMTASCHE }}
13-
submodules: true
1411

1512
- name: pods
1613
run: pod install
@@ -24,9 +21,12 @@ jobs:
2421
- name: pip
2522
run: python3 -m ensurepip
2623
- name: conan
27-
run: pip3 install conan
24+
run: pip3 install conan==1.64.1
2825
- name: conan repo
29-
run: conan remote add odr https://odr.jfrog.io/artifactory/api/conan/odr-conan
26+
run: |
27+
conan remote clean
28+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
29+
conan remote add conancenter https://center.conan.io
3030
3131
- name: run tests
3232
run: bundle exec fastlane tests

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
ACD9BE3C2444A371009014E6 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACD9BE2D2444A371009014E6 /* ConfigurationManager.swift */; };
2626
ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */; };
2727
ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */; };
28+
E19A47C42C24539E004A81C2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E19A47C32C24539E004A81C2 /* Foundation.framework */; };
2829
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
2930
E22B252F2557F0E2001D0C52 /* OpenDocumentReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */; };
3031
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
@@ -97,6 +98,7 @@
9798
C39C76F36758805489D19A8D /* Pods-OpenDocumentReader.debug lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig"; sourceTree = "<group>"; };
9899
D7F1C22195A1CA95F6A6DEF4 /* Pods-OpenDocumentReaderTests.debug lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReaderTests.debug lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReaderTests/Pods-OpenDocumentReaderTests.debug lite.xcconfig"; sourceTree = "<group>"; };
99100
DF0AB0A593247807A3F41DFA /* Pods_OpenDocumentReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReader.framework; sourceTree = BUILT_PRODUCTS_DIR; };
101+
E19A47C32C24539E004A81C2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
100102
E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
101103
E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenDocumentReaderTests.swift; sourceTree = "<group>"; };
102104
E22B25302557F0E2001D0C52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -134,6 +136,7 @@
134136
buildActionMask = 2147483647;
135137
files = (
136138
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */,
139+
E19A47C42C24539E004A81C2 /* Foundation.framework in Frameworks */,
137140
523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */,
138141
52A348B42A92635E00DACAB9 /* Pods_OpenDocumentReader.framework in Frameworks */,
139142
523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */,
@@ -175,6 +178,7 @@
175178
E2BB4B64220EF4F20056176B /* Frameworks */ = {
176179
isa = PBXGroup;
177180
children = (
181+
E19A47C32C24539E004A81C2 /* Foundation.framework */,
178182
52A348B32A92635E00DACAB9 /* Pods_OpenDocumentReader.framework */,
179183
523A371628CCF28900876C77 /* AppTrackingTransparency.framework */,
180184
523A371428CCF28100876C77 /* StoreKit.framework */,
@@ -607,19 +611,16 @@
607611
MARKETING_VERSION = 1.31;
608612
OTHER_CFLAGS = (
609613
"$(inherited)",
610-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
611614
"-arch",
612615
arm64,
613616
);
614617
OTHER_CPLUSPLUSFLAGS = (
615618
"$(inherited)",
616-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
617619
"-arch",
618620
arm64,
619621
);
620622
OTHER_LDFLAGS = (
621623
"$(inherited)",
622-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
623624
"-arch",
624625
arm64,
625626
"-lodr",
@@ -723,19 +724,16 @@
723724
MARKETING_VERSION = 1.31;
724725
OTHER_CFLAGS = (
725726
"$(inherited)",
726-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
727727
"-arch",
728728
arm64,
729729
);
730730
OTHER_CPLUSPLUSFLAGS = (
731731
"$(inherited)",
732-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
733732
"-arch",
734733
arm64,
735734
);
736735
OTHER_LDFLAGS = (
737736
"$(inherited)",
738-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
739737
"-arch",
740738
arm64,
741739
"-lodr",
@@ -987,19 +985,16 @@
987985
MARKETING_VERSION = 1.31;
988986
OTHER_CFLAGS = (
989987
"$(inherited)",
990-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
991988
"-arch",
992989
arm64,
993990
);
994991
OTHER_CPLUSPLUSFLAGS = (
995992
"$(inherited)",
996-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
997993
"-arch",
998994
arm64,
999995
);
1000996
OTHER_LDFLAGS = (
1001997
"$(inherited)",
1002-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
1003998
"-arch",
1004999
arm64,
10051000
"-lodr",
@@ -1044,19 +1039,16 @@
10441039
MARKETING_VERSION = 1.31;
10451040
OTHER_CFLAGS = (
10461041
"$(inherited)",
1047-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
10481042
"-arch",
10491043
arm64,
10501044
);
10511045
OTHER_CPLUSPLUSFLAGS = (
10521046
"$(inherited)",
1053-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
10541047
"-arch",
10551048
arm64,
10561049
);
10571050
OTHER_LDFLAGS = (
10581051
"$(inherited)",
1059-
"-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk",
10601052
"-arch",
10611053
arm64,
10621054
"-lodr",

‎OpenDocumentReader/CoreWrapper.mm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <string>
1616
#include <optional>
1717
#include <odr/document.hpp>
18-
#include <odr/document_cursor.hpp>
1918
#include <odr/document_element.hpp>
2019
#include <odr/file.hpp>
2120
#include <odr/html.hpp>

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,4 @@ SPEC CHECKSUMS:
182182

183183
PODFILE CHECKSUM: 35cd182dc790891ebc7626066c33a6e947e7167e
184184

185-
COCOAPODS: 1.12.1
185+
COCOAPODS: 1.15.2

‎ios‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ include(default)
22

33
[settings]
44
os=iOS
5+
os.sdk=iphone
56
os.version=14.0
67
arch=armv8
78
build_type=Release
9+
compiler=apple-clang
10+
compiler.version=12.0
11+
compiler.libcxx=libc++
812

913
[build_requires]
10-
darwin-toolchain/1.0.8@theodelrieu/testing
14+
darwin-toolchain/1.0.8@

‎ios-simulator‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ include(default)
22

33
[settings]
44
os=iOS
5+
os.sdk=iphonesimulator
56
os.version=14.0
67
arch=x86_64
78
build_type=Release
9+
compiler=apple-clang
10+
compiler.version=12.0
11+
compiler.libcxx=libc++
812

913
[build_requires]
10-
darwin-toolchain/1.0.8@theodelrieu/testing
14+
darwin-toolchain/1.0.8@

0 commit comments

Comments
 (0)