zec
/
ZcashLightClientKit
mirror of https://github.com/zcash/ZcashLightClientKit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Xcode 12 cocoapods error fix (#193) 

* add arm64 damn apple

* fix: exclude arm from simulator builds

* change built platform depending on target architecture

* exclude arm64 for simulator builds
This commit is contained in:
Francisco Gindre 2020-09-24 12:00:15 -03:00 committed by GitHub
parent 9ee7b69f64
commit 86b20c4236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Example/ZcashLightClientSample/Podfile
View File

@ -40,7 +40,7 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
# config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
if target.name == 'ZcashLightClientKit-Unit-Tests'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "13.0"
end

4
Example/ZcashLightClientSample/Podfile.lock
View File

@ -145,8 +145,8 @@ SPEC CHECKSUMS:
SwiftNIOTLS: 46bb3a0ff37d6b52ae6baf5207ec3cd411da327c
SwiftNIOTransportServices: 801923921fbecdcde1e1c1ff38e812167d01ead1
SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
ZcashLightClientKit: da23702d76723911cd52fbd033db240ea0b4e3a4
ZcashLightClientKit: 56b2028af2c1fe0abd629669e459bfe548d9e929
PODFILE CHECKSUM: dc66de93ef2abbd39ca1595dd3020a5fbd62c9bd
PODFILE CHECKSUM: 49a1f55967919debfba617b18c7e4e4e78b8c86d
COCOAPODS: 1.9.3

4
Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.pbxproj
View File

@ -827,6 +827,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
EXCLUDED_ARCHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
@ -888,6 +889,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
EXCLUDED_ARCHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -914,6 +916,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6J82A38BF9;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
INFOPLIST_FILE = ZcashLightClientSample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
LD_RUNPATH_SEARCH_PATHS = (
@ -937,6 +940,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6J82A38BF9;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
INFOPLIST_FILE = ZcashLightClientSample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
LD_RUNPATH_SEARCH_PATHS = (

2
ZcashLightClientKit.podspec
View File

@ -19,6 +19,8 @@ Pod::Spec.new do |s|
s.module_map = 'ZcashLightClientKit.modulemap'
s.swift_version = '5.1'
s.ios.deployment_target = '12.0'
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.dependency 'gRPC-Swift', '= 1.0.0-alpha.19'
s.dependency 'SQLite.swift', '~> 0.12.2'
s.ios.vendored_libraries = 'lib/libzcashlc.a'