diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml index 1463b0f..73e0305 100644 --- a/.github/workflows/ios_main.yml +++ b/.github/workflows/ios_main.yml @@ -55,8 +55,6 @@ jobs: -s build_type=Release -s "&:build_type=RelWithDebInfo" -s "odrcore/*:build_type=RelWithDebInfo" - - name: conan patch - run: bash conan/patch.sh - name: run tests run: bundle exec fastlane tests diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index 144597a..67f6b50 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ }; }; buildConfigurationList = E2F7ED4A220B54D600D63515 /* Build configuration list for PBXProject "OpenDocumentReader" */; - compatibilityVersion = "Xcode 11.0"; + compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -553,7 +553,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -568,14 +567,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = "Debug Lite"; }; @@ -597,7 +594,6 @@ INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist"; INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -609,7 +605,6 @@ SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = "Debug Lite"; }; @@ -652,7 +647,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -661,13 +655,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; name = "Release Lite"; @@ -690,7 +683,6 @@ INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist"; INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -700,7 +692,6 @@ PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = "Release Lite"; }; @@ -720,7 +711,6 @@ PRODUCT_BUNDLE_IDENTIFIER = app.opendocument.OpenDocumentReaderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenDocumentReader.app/OpenDocumentReader"; }; name = Debug; @@ -741,7 +731,6 @@ PRODUCT_BUNDLE_IDENTIFIER = app.opendocument.OpenDocumentReaderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenDocumentReader.app/OpenDocumentReader"; }; name = "Debug Lite"; @@ -762,7 +751,6 @@ PRODUCT_BUNDLE_IDENTIFIER = app.opendocument.OpenDocumentReaderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenDocumentReader.app/OpenDocumentReader"; }; name = Release; @@ -783,7 +771,6 @@ PRODUCT_BUNDLE_IDENTIFIER = app.opendocument.OpenDocumentReaderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OpenDocumentReader.app/OpenDocumentReader"; }; name = "Release Lite"; @@ -827,7 +814,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -842,14 +828,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -892,7 +876,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -901,13 +884,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; }; name = Release; @@ -930,7 +912,6 @@ INFOPLIST_FILE = OpenDocumentReader/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -942,7 +923,6 @@ SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -964,7 +944,6 @@ INFOPLIST_FILE = OpenDocumentReader/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "OpenDocument Reader"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -974,7 +953,6 @@ PRODUCT_NAME = "$(BUNDLE_DISPLAY_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/README.md b/README.md index a82f72e..5e0310e 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ It's Android's first OpenOffice Document Reader... for iOS! ## Setup 1. run "pod install" -2. run "bash build-simulator.sh" or "bash build-device.sh" +2. run "bash conan/setup-all.sh" 3. open workspace in Xcode diff --git a/conan/patch.sh b/conan/patch.sh deleted file mode 100644 index 28f513d..0000000 --- a/conan/patch.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -echo "patch conan generated xcconfig files" - -# patch xcconfig - see https://github.com/conan-io/conan/issues/16526 -sed -i '' -E 's/\]\[arch=arm64\]\[/][/g;t' conan-output/*.xcconfig -sed -i '' -E 's/\]\[arch=x86_64\]\[/][/g;t' conan-output/*.xcconfig - -echo "done" diff --git a/conan/setup-all.sh b/conan/setup-all.sh index ee3063d..49504a9 100644 --- a/conan/setup-all.sh +++ b/conan/setup-all.sh @@ -29,5 +29,3 @@ for arch in "arm64" "x64"; do -o "configuration=${configuration}" done done - -bash conan/patch.sh diff --git a/configs/debug-lite.xcconfig b/configs/debug-lite.xcconfig index c86e8e0..a5bf163 100644 --- a/configs/debug-lite.xcconfig +++ b/configs/debug-lite.xcconfig @@ -1,3 +1,7 @@ #include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig" +// somehow the Pods definition of this variable is harmful to the conan defintition +// it looks like the one from Pods is not crucial so we can drop it +LIBRARY_SEARCH_PATHS = + #include "conan-output/conan_config.xcconfig" diff --git a/configs/debug.xcconfig b/configs/debug.xcconfig index 945b666..f370f45 100644 --- a/configs/debug.xcconfig +++ b/configs/debug.xcconfig @@ -1,3 +1,7 @@ #include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig" +// somehow the Pods definition of this variable is harmful to the conan defintition +// it looks like the one from Pods is not crucial so we can drop it +LIBRARY_SEARCH_PATHS = + #include "conan-output/conan_config.xcconfig" diff --git a/configs/release-lite.xcconfig b/configs/release-lite.xcconfig index 87778ae..844ac95 100644 --- a/configs/release-lite.xcconfig +++ b/configs/release-lite.xcconfig @@ -1,3 +1,7 @@ #include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release lite.xcconfig" +// somehow the Pods definition of this variable is harmful to the conan defintition +// it looks like the one from Pods is not crucial so we can drop it +LIBRARY_SEARCH_PATHS = + #include "conan-output/conan_config.xcconfig" diff --git a/configs/release.xcconfig b/configs/release.xcconfig index f5534e8..07a7f65 100644 --- a/configs/release.xcconfig +++ b/configs/release.xcconfig @@ -1,3 +1,7 @@ #include "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig" +// somehow the Pods definition of this variable is harmful to the conan defintition +// it looks like the one from Pods is not crucial so we can drop it +LIBRARY_SEARCH_PATHS = + #include "conan-output/conan_config.xcconfig"