From eb7d658fa23bdf38d54b46b1b7c4f90121b446a4 Mon Sep 17 00:00:00 2001 From: Gleb Kovalenko Date: Tue, 11 Apr 2023 19:05:39 +0300 Subject: [PATCH] Fix arm target --- SDAO.xcodeproj/project.pbxproj | 122 +++++++++------------------------ podfile | 11 ++- 2 files changed, 37 insertions(+), 96 deletions(-) diff --git a/SDAO.xcodeproj/project.pbxproj b/SDAO.xcodeproj/project.pbxproj index c96c26b..84ce14d 100644 --- a/SDAO.xcodeproj/project.pbxproj +++ b/SDAO.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -647,36 +647,43 @@ TargetAttributes = { 3358B63C1F19F8B100CBD8CF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 0900; ProvisioningStyle = Automatic; }; 3358B64B1F19F8BB00CBD8CF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 0920; ProvisioningStyle = Manual; }; 3358B65A1F19F8C900CBD8CF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 1150; ProvisioningStyle = Automatic; }; 337B5A111F17615000F4FDAF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 1150; ProvisioningStyle = Automatic; }; 337B5A2C1F17616F00F4FDAF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 1150; ProvisioningStyle = Automatic; }; 337B5A391F17617700F4FDAF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 1150; ProvisioningStyle = Automatic; }; 337B5A461F1763DB00F4FDAF = { CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 7Q8EP54N3L; LastSwiftMigration = 1150; ProvisioningStyle = Automatic; }; @@ -1162,11 +1169,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1219,18 +1222,13 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.incetro.DAO-macOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; }; @@ -1279,11 +1277,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.incetro.DAO-tvOS-Tests"; @@ -1335,18 +1329,13 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.incetro.DAO-tvOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 12.0; @@ -1399,11 +1388,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.incetro.DAO-iOS-Tests"; @@ -1455,17 +1440,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/DAOTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.incetro.DAO-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; @@ -1595,12 +1575,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; @@ -1662,19 +1638,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; PRODUCT_NAME = SDAO; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1735,11 +1706,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; @@ -1753,7 +1720,7 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 6.0; }; name = Debug; }; @@ -1802,25 +1769,20 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; PRODUCT_NAME = SDAO; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 6.0; }; name = Release; }; @@ -1874,11 +1836,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; @@ -1940,18 +1898,13 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; PRODUCT_NAME = SDAO; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; @@ -2014,11 +1967,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -2081,19 +2030,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/SDAO/Supporting/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.incetro.dao; PRODUCT_NAME = SDAO; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/podfile b/podfile index 1b00165..382b42a 100644 --- a/podfile +++ b/podfile @@ -1,21 +1,21 @@ use_frameworks! def standard_pods - pod "Monreau", "~> 2.1.4" + pod 'Monreau', :git => 'https://github.com/Incetro/Monreau.git', :branch => 'fix/arm_target' end target "SDAO iOS" do - platform :ios, "12.0" + platform :ios, "13.0" standard_pods end target "SDAO iOS-Tests" do - platform :ios, "12.0" + platform :ios, "13.0" standard_pods end target "SDAO watchOS" do - platform :watchos, "3.0" + platform :watchos, "7.0" standard_pods end @@ -49,7 +49,4 @@ post_install do |installer| end end end - installer.pods_project.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" - end end