From fafdc2294a6123df0a271b05bc5f00f89f78e396 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Mon, 24 Jun 2024 00:40:24 +0200 Subject: [PATCH] fix build (#81) --- .github/workflows/ios_main.yml | 10 +++++----- OpenDocumentReader.xcodeproj/project.pbxproj | 16 ++++------------ OpenDocumentReader/CoreWrapper.mm | 1 - Podfile.lock | 2 +- ios | 6 +++++- ios-simulator | 6 +++++- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml index 288fb1b..c43e1fe 100644 --- a/.github/workflows/ios_main.yml +++ b/.github/workflows/ios_main.yml @@ -8,9 +8,6 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - with: - token: ${{ secrets.PAT_TOMTASCHE }} - submodules: true - name: pods run: pod install @@ -24,9 +21,12 @@ jobs: - name: pip run: python3 -m ensurepip - name: conan - run: pip3 install conan + run: pip3 install conan==1.64.1 - name: conan repo - run: conan remote add odr https://odr.jfrog.io/artifactory/api/conan/odr-conan + run: | + conan remote clean + conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan + conan remote add conancenter https://center.conan.io - name: run tests run: bundle exec fastlane tests diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index 2c188f9..ce58e9e 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ ACD9BE3C2444A371009014E6 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACD9BE2D2444A371009014E6 /* ConfigurationManager.swift */; }; ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */; }; ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */; }; + E19A47C42C24539E004A81C2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E19A47C32C24539E004A81C2 /* Foundation.framework */; }; E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; }; E22B252F2557F0E2001D0C52 /* OpenDocumentReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */; }; E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; }; @@ -97,6 +98,7 @@ 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 = ""; }; 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 = ""; }; DF0AB0A593247807A3F41DFA /* Pods_OpenDocumentReader.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenDocumentReader.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E19A47C32C24539E004A81C2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; }; E22B252E2557F0E2001D0C52 /* OpenDocumentReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenDocumentReaderTests.swift; sourceTree = ""; }; E22B25302557F0E2001D0C52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -134,6 +136,7 @@ buildActionMask = 2147483647; files = ( E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */, + E19A47C42C24539E004A81C2 /* Foundation.framework in Frameworks */, 523A371728CCF28900876C77 /* AppTrackingTransparency.framework in Frameworks */, 52A348B42A92635E00DACAB9 /* Pods_OpenDocumentReader.framework in Frameworks */, 523A371528CCF28100876C77 /* StoreKit.framework in Frameworks */, @@ -175,6 +178,7 @@ E2BB4B64220EF4F20056176B /* Frameworks */ = { isa = PBXGroup; children = ( + E19A47C32C24539E004A81C2 /* Foundation.framework */, 52A348B32A92635E00DACAB9 /* Pods_OpenDocumentReader.framework */, 523A371628CCF28900876C77 /* AppTrackingTransparency.framework */, 523A371428CCF28100876C77 /* StoreKit.framework */, @@ -607,19 +611,16 @@ MARKETING_VERSION = 1.31; OTHER_CFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_CPLUSPLUSFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_LDFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, "-lodr", @@ -723,19 +724,16 @@ MARKETING_VERSION = 1.31; OTHER_CFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_CPLUSPLUSFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_LDFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, "-lodr", @@ -987,19 +985,16 @@ MARKETING_VERSION = 1.31; OTHER_CFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_CPLUSPLUSFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_LDFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, "-lodr", @@ -1044,19 +1039,16 @@ MARKETING_VERSION = 1.31; OTHER_CFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_CPLUSPLUSFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, ); OTHER_LDFLAGS = ( "$(inherited)", - "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk", "-arch", arm64, "-lodr", diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index daf6d7e..4572bd1 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/Podfile.lock b/Podfile.lock index e2afb49..0c0adb7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -182,4 +182,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 35cd182dc790891ebc7626066c33a6e947e7167e -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/ios b/ios index e6aa729..12e29ef 100644 --- a/ios +++ b/ios @@ -2,9 +2,13 @@ include(default) [settings] os=iOS +os.sdk=iphone os.version=14.0 arch=armv8 build_type=Release +compiler=apple-clang +compiler.version=12.0 +compiler.libcxx=libc++ [build_requires] -darwin-toolchain/1.0.8@theodelrieu/testing +darwin-toolchain/1.0.8@ diff --git a/ios-simulator b/ios-simulator index fef7050..eed1a24 100644 --- a/ios-simulator +++ b/ios-simulator @@ -2,9 +2,13 @@ include(default) [settings] os=iOS +os.sdk=iphonesimulator os.version=14.0 arch=x86_64 build_type=Release +compiler=apple-clang +compiler.version=12.0 +compiler.libcxx=libc++ [build_requires] -darwin-toolchain/1.0.8@theodelrieu/testing +darwin-toolchain/1.0.8@