Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap zip library implementation on iOS to zip in memory #217

Merged
merged 8 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [Unreleased]

### Changed
* Replaced the Zip library to introduce in memory ziping during file upload
* Remove `prodUrl` and `testURl` from Config model struct since the `prod_url` and `test_url` keys are no longer used in the `smile_config.json` file.

## 10.2.6
Expand Down
18 changes: 9 additions & 9 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PODS:
- lottie-ios (4.4.3)
- netfox (1.21.0)
- Sentry (8.31.1):
- Sentry/Core (= 8.31.1)
- Sentry/Core (8.31.1)
- Sentry (8.32.0):
- Sentry/Core (= 8.32.0)
- Sentry/Core (8.32.0)
- SmileID (10.2.6):
- lottie-ios (~> 4.4.2)
- Zip (~> 2.1.0)
- ZIPFoundation (~> 0.9)
- SwiftLint (0.55.1)
- Zip (2.1.2)
- ZIPFoundation (0.9.19)

DEPENDENCIES:
- netfox
Expand All @@ -22,7 +22,7 @@ SPEC REPOS:
- netfox
- Sentry
- SwiftLint
- Zip
- ZIPFoundation

EXTERNAL SOURCES:
SmileID:
Expand All @@ -31,10 +31,10 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
netfox: 9d5cc727fe7576c4c7688a2504618a156b7d44b7
Sentry: 9c1188876ea1291d1a9db4b38c3f17ebd8e6985e
SmileID: 4d7ceb56eeac0a5255c03039fa6d694dd5e8ff56
Sentry: 96ae1dcdf01a644bc3a3b1dc279cecaf48a833fb
SmileID: f842cbb3aace354f845ea8b881676ae4e0031b33
SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
Zip: b3fef584b147b6e582b2256a9815c897d60ddc67
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c

PODFILE CHECKSUM: 8f7be2cf75babf479684f1e21d344f4c640486be

Expand Down
12 changes: 6 additions & 6 deletions Example/SmileID.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
20B6D5EC2C21CE660023D51C /* DataStoreError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20B6D5EB2C21CE660023D51C /* DataStoreError.swift */; };
20C360C82C454C130008DBDE /* RootViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C360C72C454C130008DBDE /* RootViewModel.swift */; };
20DFA0EC2C21917100AC2AE7 /* View+TextSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20DFA0EB2C21917100AC2AE7 /* View+TextSelection.swift */; };
20F3D6F32C25F4D700B32751 /* (null) in Sources */ = {isa = PBXBuildFile; };
20F3D6F32C25F4D700B32751 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
20F3D6F62C25F5C100B32751 /* SmileID.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 20F3D6F42C25F5C100B32751 /* SmileID.xcdatamodeld */; };
5829A8C02BC7429A001C1E7E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 5829A8BF2BC7429A001C1E7E /* PrivacyInfo.xcprivacy */; };
585BE4882AC7748E0091DDD8 /* RestartableTimerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585BE4872AC7748E0091DDD8 /* RestartableTimerTest.swift */; };
Expand All @@ -48,7 +48,7 @@
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
620F1E982B69194900185CD2 /* AlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 620F1E972B69194900185CD2 /* AlertView.swift */; };
620F1E9A2B691ABB00185CD2 /* (null) in Resources */ = {isa = PBXBuildFile; };
620F1E9A2B691ABB00185CD2 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
624777D02B0CDC9F00952842 /* EnhancedKycWithIdInputScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 624777CF2B0CDC9F00952842 /* EnhancedKycWithIdInputScreen.swift */; };
62F6766F2B0D173600417419 /* EnhancedKycWithIdInputScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62F6766E2B0D173600417419 /* EnhancedKycWithIdInputScreenViewModel.swift */; };
62F676712B0E00E800417419 /* EnhancedKycResultDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62F676702B0E00E800417419 /* EnhancedKycResultDelegate.swift */; };
Expand Down Expand Up @@ -546,7 +546,7 @@
buildActionMask = 2147483647;
files = (
1EFAB3172A375265008E3C13 /* Images.xcassets in Resources */,
620F1E9A2B691ABB00185CD2 /* (null) in Resources */,
620F1E9A2B691ABB00185CD2 /* BuildFile in Resources */,
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
5829A8C02BC7429A001C1E7E /* PrivacyInfo.xcprivacy in Resources */,
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
Expand All @@ -572,15 +572,15 @@
"${PODS_ROOT}/Target Support Files/Pods-SmileID_Example/Pods-SmileID_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
"${BUILT_PRODUCTS_DIR}/SmileID/SmileID.framework",
"${BUILT_PRODUCTS_DIR}/Zip/Zip.framework",
"${BUILT_PRODUCTS_DIR}/ZIPFoundation/ZIPFoundation.framework",
"${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework",
"${BUILT_PRODUCTS_DIR}/netfox/netfox.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SmileID.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Zip.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/netfox.framework",
);
Expand Down Expand Up @@ -689,7 +689,7 @@
1ED53F6D2A2F28590020BEFB /* SmileTextField.swift in Sources */,
91CB21A52AC10C61005AEBF5 /* NavigationBar.swift in Sources */,
1ED53F6B2A2F28590020BEFB /* ProductCell.swift in Sources */,
20F3D6F32C25F4D700B32751 /* (null) in Sources */,
20F3D6F32C25F4D700B32751 /* BuildFile in Sources */,
1E60ED382A29C306002695FF /* Constants.swift in Sources */,
624777D02B0CDC9F00952842 /* EnhancedKycWithIdInputScreen.swift in Sources */,
1ED53F712A2F28590020BEFB /* EnterUserIDView.swift in Sources */,
Expand Down
14 changes: 7 additions & 7 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
{
"identity" : "lottie-spm",
"kind" : "remoteSourceControl",
"location" : "https://github.com/airbnb/lottie-spm.git",
"location" : "https://github.com/airbnb/lottie-spm",
"state" : {
"revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
"version" : "4.4.3"
"revision" : "b842598f1295f3ffa1475b1580672d1fe5b83580",
"version" : "4.5.0"
}
},
{
"identity" : "zip",
"identity" : "zipfoundation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/marmelroy/Zip",
"location" : "https://github.com/weichsel/ZIPFoundation.git",
"state" : {
"revision" : "67fa55813b9e7b3b9acee9c0ae501def28746d76",
"version" : "2.1.2"
"revision" : "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0",
"version" : "0.9.19"
}
}
],
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/marmelroy/Zip", .upToNextMajor(from: "2.1.0")),
.package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMajor(from: "0.9.0")),
.package(url: "https://github.com/airbnb/lottie-spm", from: "4.4.2")
],
targets: [
.target(
name: "SmileID",
dependencies: ["Zip", .product(name: "Lottie", package: "lottie-spm")],
dependencies: ["ZIPFoundation", .product(name: "Lottie", package: "lottie-spm")],
path: "Sources/SmileID",
resources: [.process("Resources")]
),
Expand Down
2 changes: 1 addition & 1 deletion SmileID.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Pod::Spec.new do |s|
s.author = { 'Japhet' => '[email protected]', 'Juma Allan' => '[email protected]', 'Vansh Gandhi' => '[email protected]'}
s.source = { :git => "https://github.com/smileidentity/ios.git", :tag => "v10.2.6" }
s.ios.deployment_target = '13.0'
s.dependency 'Zip', '~> 2.1.0'
s.dependency 'ZIPFoundation', '~> 0.9'
s.dependency 'lottie-ios', '~> 4.4.2'
s.swift_version = '5.5'
s.source_files = 'Sources/SmileID/Classes/**/*'
Expand Down
Loading
Loading