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

Merge pull request #200 from zcash/modular-headers 

Modular headers
This commit is contained in:
Francisco Gindre 2020-10-01 17:23:35 -03:00 committed by GitHub
parent ad04f8f0e8 890a4eb5a9
commit bd59c2ce19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Example/ZcashLightClientSample/Podfile
View File

@ -2,7 +2,7 @@ platform :ios, '13.0'
target 'ZcashLightClientSample' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
use_modular_headers!
pod "KRProgressHUD"
# Pods for ZcashLightClientSample
pod 'ZcashLightClientKit', :path => '../../', :testspecs => ['Tests']
@ -15,7 +15,6 @@ target 'ZcashLightClientSample' do
use_frameworks!
inherit! :search_paths
# Pods for testing
pod 'MnemonicSwift'
end
target 'ZcashLightClientSampleUITests' do

5
Example/ZcashLightClientSample/Podfile.lock
View File

@ -77,7 +77,6 @@ DEPENDENCIES:
- gRPC-Swift (= 1.0.0-alpha.19)
- gRPC-Swift-Plugins (= 1.0.0-alpha.19)
- KRProgressHUD
- MnemonicSwift
- MnemonicSwift (~> 2.0.0)
- NotificationBubbles
- PaginatedTableView
@ -146,8 +145,8 @@ SPEC CHECKSUMS:
SwiftNIOTLS: 46bb3a0ff37d6b52ae6baf5207ec3cd411da327c
SwiftNIOTransportServices: 801923921fbecdcde1e1c1ff38e812167d01ead1
SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
ZcashLightClientKit: 07c805ae23308bf7a4e49c9a55a0e0d3f95bb32d
ZcashLightClientKit: cf07efe70d59e33df138f16f260a48eba6aeb613
PODFILE CHECKSUM: ffeb4596d23ff6fe39bab7d0d8d99cb9916c4347
PODFILE CHECKSUM: 1c92e6c09a1a06d8ef4fcf753ebcbe9ea41fb771
COCOAPODS: 1.9.3

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

@ -42,14 +42,13 @@
0DA58B942397DDD9004596EA /* TransactionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DA58B932397DDD9004596EA /* TransactionsTableViewController.swift */; };
0DA58B962397F2CB004596EA /* TransactionsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DA58B952397F2CB004596EA /* TransactionsDataSource.swift */; };
0DBF8F9523A80F5A0010B85F /* TransactionDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DBF8F9423A80F5A0010B85F /* TransactionDetailViewController.swift */; };
0DC30CFDB2CDAF56E3066E8F /* (null) in Frameworks */ = {isa = PBXBuildFile; };
0DCD3DC7238D88B100DD3EC4 /* GetBalanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCD3DC6238D88B100DD3EC4 /* GetBalanceViewController.swift */; };
0DDFB33C236B743000AED892 /* LatestHeightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DDFB33B236B743000AED892 /* LatestHeightViewController.swift */; };
0DDFB33E236B844900AED892 /* DemoAppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DDFB33D236B844900AED892 /* DemoAppConfig.swift */; };
0DF53E6723A438F100D7249C /* PaginatedTransactionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF53E6623A438F100D7249C /* PaginatedTransactionsViewController.swift */; };
6355F11E6389A7F4FD9F21F7 /* Pods_ZcashLightClientSample_Mainnet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49540782BAF7E579947E23C4 /* Pods_ZcashLightClientSample_Mainnet.framework */; };
742DCA7AFF9FBEA217FD3EED /* Pods_ZcashLightClientSampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33F67E6BA5A27016288E77EB /* Pods_ZcashLightClientSampleUITests.framework */; };
96B47C51F3E49A248D9EB4D9 /* Pods_ZcashLightClientSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5E1724A6A0F7C745C6E30D0 /* Pods_ZcashLightClientSample.framework */; };
8B6C57670F3DC120D19643F4 /* libPods-ZcashLightClientSample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF3AF259726D0F9D6574293D /* libPods-ZcashLightClientSample.a */; };
A459F9A413C2AB70A02FE894 /* Pods_ZcashLightClientSampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C89C3AE14EA6993FECC643BC /* Pods_ZcashLightClientSampleTests.framework */; };
/* End PBXBuildFile section */
@ -109,8 +108,8 @@
81B2AC726EA5CC3FEF521F84 /* Pods-ZcashLightClientSampleUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZcashLightClientSampleUITests.debug.xcconfig"; path = "Target Support Files/Pods-ZcashLightClientSampleUITests/Pods-ZcashLightClientSampleUITests.debug.xcconfig"; sourceTree = "<group>"; };
90F55027AEE5406E35644223 /* Pods-ZcashLightClientSample-Mainnet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZcashLightClientSample-Mainnet.debug.xcconfig"; path = "Target Support Files/Pods-ZcashLightClientSample-Mainnet/Pods-ZcashLightClientSample-Mainnet.debug.xcconfig"; sourceTree = "<group>"; };
93F435FD5C95BEE3BC7BBC28 /* Pods-ZcashLightClientSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZcashLightClientSample.debug.xcconfig"; path = "Target Support Files/Pods-ZcashLightClientSample/Pods-ZcashLightClientSample.debug.xcconfig"; sourceTree = "<group>"; };
A5E1724A6A0F7C745C6E30D0 /* Pods_ZcashLightClientSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ZcashLightClientSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BEA142AE2F3C339269CBA120 /* Pods-ZcashLightClientSampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZcashLightClientSampleTests.release.xcconfig"; path = "Target Support Files/Pods-ZcashLightClientSampleTests/Pods-ZcashLightClientSampleTests.release.xcconfig"; sourceTree = "<group>"; };
BF3AF259726D0F9D6574293D /* libPods-ZcashLightClientSample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZcashLightClientSample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C89C3AE14EA6993FECC643BC /* Pods_ZcashLightClientSampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ZcashLightClientSampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@ -127,8 +126,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0DC30CFDB2CDAF56E3066E8F /* (null) in Frameworks */,
96B47C51F3E49A248D9EB4D9 /* Pods_ZcashLightClientSample.framework in Frameworks */,
8B6C57670F3DC120D19643F4 /* libPods-ZcashLightClientSample.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -305,7 +303,7 @@
C89C3AE14EA6993FECC643BC /* Pods_ZcashLightClientSampleTests.framework */,
33F67E6BA5A27016288E77EB /* Pods_ZcashLightClientSampleUITests.framework */,
49540782BAF7E579947E23C4 /* Pods_ZcashLightClientSample_Mainnet.framework */,
A5E1724A6A0F7C745C6E30D0 /* Pods_ZcashLightClientSample.framework */,
BF3AF259726D0F9D6574293D /* libPods-ZcashLightClientSample.a */,
);
name = Frameworks;
sourceTree = "<group>";
@ -342,7 +340,6 @@
0D907F0E2322CC5900D641FE /* Sources */,
0D907F0F2322CC5900D641FE /* Frameworks */,
0D907F102322CC5900D641FE /* Resources */,
6F790CD178809E37D3EE225C /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -361,7 +358,6 @@
0D907F222322CC5B00D641FE /* Sources */,
0D907F232322CC5B00D641FE /* Frameworks */,
0D907F242322CC5B00D641FE /* Resources */,
7A57B65D55A9E13EAF5B4322 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -556,40 +552,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
6F790CD178809E37D3EE225C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSample/Pods-ZcashLightClientSample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSample/Pods-ZcashLightClientSample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSample/Pods-ZcashLightClientSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
7A57B65D55A9E13EAF5B4322 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSampleTests/Pods-ZcashLightClientSampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSampleTests/Pods-ZcashLightClientSampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZcashLightClientSampleTests/Pods-ZcashLightClientSampleTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A18B8A4D55F1DF8B808ABB67 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

1
Scripts/script_commons.sh
View File

@ -12,6 +12,7 @@ export ZCASH_MAINNET="MAINNET"
export ZCASH_SRC_PATH="${PODS_TARGET_SRCROOT}/ZcashLightClientKit"
export ZCASH_SDK_RUST_LIB_PATH="${ZCASH_SRC_PATH}/zcashlc"
export ZCASH_SDK_GENERATED_SOURCES_FOLDER="${ZCASH_SRC_PATH}/Generated"
function clean {
echo "CLEAN DETECTED"
cargo clean

3
ZcashLightClientKit.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ZcashLightClientKit'
s.version = '0.6.5'
s.version = '0.6.6'
s.summary = 'Zcash Light Client wallet SDK for iOS'
s.description = <<-DESC
@ -16,7 +16,6 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/zcash/ZcashLightClientKit.git', :tag => s.version.to_s }
s.source_files = 'ZcashLightClientKit/**/*.{swift,h,a}'
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' }