Skip to content

Commit

Permalink
chore: replace ZipArchive pod with SPM
Browse files Browse the repository at this point in the history
  • Loading branch information
tisfeng committed Dec 31, 2023
1 parent 289e832 commit 4e33a8e
Show file tree
Hide file tree
Showing 68 changed files with 1,539 additions and 16,165 deletions.
17 changes: 17 additions & 0 deletions Easydict.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
03882F9029D95044005B5A52 /* ToastWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 03882F8829D95044005B5A52 /* ToastWindowController.xib */; };
03882F9129D95044005B5A52 /* CTCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 03882F8929D95044005B5A52 /* CTCommon.m */; };
03882F9229D95044005B5A52 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 03882F8C29D95044005B5A52 /* Info.plist */; };
038EA1AA2B41169C008A6DD1 /* ZipArchive in Frameworks */ = {isa = PBXBuildFile; productRef = 038EA1A92B41169C008A6DD1 /* ZipArchive */; };
0396D611292C932F006A11D9 /* EZSelectLanguageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0396D610292C932F006A11D9 /* EZSelectLanguageCell.m */; };
0396D615292CC4C3006A11D9 /* EZLocalStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0396D614292CC4C3006A11D9 /* EZLocalStorage.m */; };
03991158292927E000E1B06D /* EZTitlebar.m in Sources */ = {isa = PBXBuildFile; fileRef = 03991157292927E000E1B06D /* EZTitlebar.m */; };
Expand Down Expand Up @@ -773,6 +774,7 @@
03A830902B4073E700112834 /* AppCenterAnalytics in Frameworks */,
03B63ABF2A86967800E155ED /* CoreServices.framework in Frameworks */,
038030972B4106800009230C /* CocoaLumberjackSwift in Frameworks */,
038EA1AA2B41169C008A6DD1 /* ZipArchive in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2211,6 +2213,7 @@
03A830942B4076FC00112834 /* FirebaseAnalyticsSwift */,
038030942B4106800009230C /* CocoaLumberjack */,
038030962B4106800009230C /* CocoaLumberjackSwift */,
038EA1A92B41169C008A6DD1 /* ZipArchive */,
);
productName = Bob;
productReference = C99EEB182385796700FEE666 /* Easydict-debug.app */;
Expand Down Expand Up @@ -2267,6 +2270,7 @@
03A8308E2B4073E700112834 /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */,
03A830932B4076FC00112834 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
038030932B4106800009230C /* XCRemoteSwiftPackageReference "CocoaLumberjack" */,
038EA1A82B41169C008A6DD1 /* XCRemoteSwiftPackageReference "ZipArchive" */,
);
productRefGroup = C99EEB192385796700FEE666 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -3151,6 +3155,14 @@
minimumVersion = 3.7.1;
};
};
038EA1A82B41169C008A6DD1 /* XCRemoteSwiftPackageReference "ZipArchive" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ZipArchive/ZipArchive.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.5.5;
};
};
03A8308B2B405F8E00112834 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
Expand Down Expand Up @@ -3227,6 +3239,11 @@
package = 038030932B4106800009230C /* XCRemoteSwiftPackageReference "CocoaLumberjack" */;
productName = CocoaLumberjackSwift;
};
038EA1A92B41169C008A6DD1 /* ZipArchive */ = {
isa = XCSwiftPackageProductDependency;
package = 038EA1A82B41169C008A6DD1 /* XCRemoteSwiftPackageReference "ZipArchive" */;
productName = ZipArchive;
};
03A8308C2B405F8E00112834 /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = 03A8308B2B405F8E00112834 /* XCRemoteSwiftPackageReference "Sparkle" */;
Expand Down
9 changes: 9 additions & 0 deletions Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,15 @@
"revision" : "99680b2efc7c7dbcace1da0b3979d266f02e213c",
"version" : "5.1.0"
}
},
{
"identity" : "ziparchive",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ZipArchive/ZipArchive.git",
"state" : {
"revision" : "79d4dc9729096c6ad83dd3cee2b9f354d1b4ab7b",
"version" : "2.5.5"
}
}
],
"version" : 2
Expand Down
2 changes: 1 addition & 1 deletion Easydict/Feature/StatusItem/EZMenuItemManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import "EZWindowManager.h"
#import "Snip.h"
#import "EZShortcut.h"
#import <SSZipArchive/SSZipArchive.h>
#import <ZipArchive.h>
#import "EZRightClickDetector.h"
#import "EZConfiguration.h"
#import "Easydict-Swift.h"
Expand Down
2 changes: 0 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ target 'Easydict' do
pod 'ReactiveObjC', '~> 3.1.1'
pod 'MASShortcut', :git => '[email protected]:AkaShark/MASShortcut.git', :branch => 'double_click_modifier'
pod 'MASPreferences', '~> 1.4.1'
pod 'SSZipArchive', '~> 2.2.2'
pod 'KVOController', '~> 1.2.0'
pod 'JLRoutes', '~> 2.1'

Expand All @@ -30,7 +29,6 @@ target 'EasydictTests' do
pod 'ReactiveObjC', '~> 3.1.1'
pod 'MASShortcut', :git => '[email protected]:AkaShark/MASShortcut.git', :branch => 'double_click_modifier'
pod 'MASPreferences', '~> 1.4.1'
pod 'SSZipArchive', '~> 2.2.2'
pod 'KVOController', '~> 1.2.0'
pod 'JLRoutes', '~> 2.1'

Expand Down
6 changes: 1 addition & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ PODS:
- MASShortcut (2.4.0)
- MJExtension (3.2.4)
- ReactiveObjC (3.1.1)
- SSZipArchive (2.2.3)
- SwiftFormat/CLI (0.52.11)

DEPENDENCIES:
Expand All @@ -31,7 +30,6 @@ DEPENDENCIES:
- "MASShortcut (from `[email protected]:AkaShark/MASShortcut.git`, branch `double_click_modifier`)"
- MJExtension (~> 3.2.1)
- ReactiveObjC (~> 3.1.1)
- SSZipArchive (~> 2.2.2)
- SwiftFormat/CLI (~> 0.52.11)

SPEC REPOS:
Expand All @@ -43,7 +41,6 @@ SPEC REPOS:
- MASPreferences
- MJExtension
- ReactiveObjC
- SSZipArchive
- SwiftFormat

EXTERNAL SOURCES:
Expand All @@ -65,9 +62,8 @@ SPEC CHECKSUMS:
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
MJExtension: 88e0900751b6cac8de1cf724ca9838a0b28d5acb
ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
SwiftFormat: 2ca3d0b75754193f0f3ba532291f25ae08dd1e42

PODFILE CHECKSUM: a2f28231837dae0e5fda551e03e6e303cd214e41
PODFILE CHECKSUM: e9bdddca2d7cf15e00b0d57cb178bbfc2b1f43f9

COCOAPODS: 1.14.2
6 changes: 1 addition & 5 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4e33a8e

Please sign in to comment.