Skip to content

Commit

Permalink
chore: replace MJExtension pod with SPM
Browse files Browse the repository at this point in the history
  • Loading branch information
tisfeng committed Dec 31, 2023
1 parent 4e33a8e commit 1a6e74d
Show file tree
Hide file tree
Showing 56 changed files with 1,466 additions and 4,739 deletions.
17 changes: 17 additions & 0 deletions Easydict.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
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 */; };
038EA1AD2B41282F008A6DD1 /* MJExtension in Frameworks */ = {isa = PBXBuildFile; productRef = 038EA1AC2B41282F008A6DD1 /* MJExtension */; };
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 @@ -763,6 +764,7 @@
03022F1F2B36CF3100B63209 /* SwiftShell in Frameworks */,
038030952B4106800009230C /* CocoaLumberjack in Frameworks */,
03FD68BB2B1DC59600FD388E /* CryptoSwift in Frameworks */,
038EA1AD2B41282F008A6DD1 /* MJExtension in Frameworks */,
03CF28002B3DA7D500E19B57 /* RealmSwift in Frameworks */,
03022F222B36D1A400B63209 /* SnapKit in Frameworks */,
03A8308D2B405F8E00112834 /* Sparkle in Frameworks */,
Expand Down Expand Up @@ -2214,6 +2216,7 @@
038030942B4106800009230C /* CocoaLumberjack */,
038030962B4106800009230C /* CocoaLumberjackSwift */,
038EA1A92B41169C008A6DD1 /* ZipArchive */,
038EA1AC2B41282F008A6DD1 /* MJExtension */,
);
productName = Bob;
productReference = C99EEB182385796700FEE666 /* Easydict-debug.app */;
Expand Down Expand Up @@ -2271,6 +2274,7 @@
03A830932B4076FC00112834 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
038030932B4106800009230C /* XCRemoteSwiftPackageReference "CocoaLumberjack" */,
038EA1A82B41169C008A6DD1 /* XCRemoteSwiftPackageReference "ZipArchive" */,
038EA1AB2B41282F008A6DD1 /* XCRemoteSwiftPackageReference "MJExtension" */,
);
productRefGroup = C99EEB192385796700FEE666 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -3163,6 +3167,14 @@
minimumVersion = 2.5.5;
};
};
038EA1AB2B41282F008A6DD1 /* XCRemoteSwiftPackageReference "MJExtension" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/CoderMJLee/MJExtension";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.4.1;
};
};
03A8308B2B405F8E00112834 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sparkle-project/Sparkle";
Expand Down Expand Up @@ -3244,6 +3256,11 @@
package = 038EA1A82B41169C008A6DD1 /* XCRemoteSwiftPackageReference "ZipArchive" */;
productName = ZipArchive;
};
038EA1AC2B41282F008A6DD1 /* MJExtension */ = {
isa = XCSwiftPackageProductDependency;
package = 038EA1AB2B41282F008A6DD1 /* XCRemoteSwiftPackageReference "MJExtension" */;
productName = MJExtension;
};
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 @@ -135,6 +135,15 @@
"version" : "1.22.3"
}
},
{
"identity" : "mjextension",
"kind" : "remoteSourceControl",
"location" : "https://github.com/CoderMJLee/MJExtension",
"state" : {
"revision" : "43dce6be9c91a7034d37ed171b3e60a7bb760857",
"version" : "3.4.1"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
Expand Down
2 changes: 1 addition & 1 deletion Easydict/App/PrefixHeader.pch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//#define NSLog(frmt, ...) MMLogVerbose(frmt, ##__VA_ARGS__)

#import <Masonry/Masonry.h>
#import <MJExtension/MJExtension.h>
#import <MJExtension.h>
#import <ReactiveObjC/ReactiveObjC.h>
#import <AFNetworking/AFNetworking.h>

Expand Down
2 changes: 0 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ target 'Easydict' do
use_frameworks!

pod 'AFNetworking', '~> 3.2.1'
pod 'MJExtension', '~> 3.2.1'
pod 'Masonry', '~> 1.1.0'
pod 'ReactiveObjC', '~> 3.1.1'
pod 'MASShortcut', :git => '[email protected]:AkaShark/MASShortcut.git', :branch => 'double_click_modifier'
Expand All @@ -24,7 +23,6 @@ target 'EasydictTests' do
use_frameworks!

pod 'AFNetworking', '~> 3.2.1'
pod 'MJExtension', '~> 3.2.1'
pod 'Masonry', '~> 1.1.0'
pod 'ReactiveObjC', '~> 3.1.1'
pod 'MASShortcut', :git => '[email protected]:AkaShark/MASShortcut.git', :branch => 'double_click_modifier'
Expand Down
6 changes: 1 addition & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ PODS:
- Masonry (1.1.0)
- MASPreferences (1.4.1)
- MASShortcut (2.4.0)
- MJExtension (3.2.4)
- ReactiveObjC (3.1.1)
- SwiftFormat/CLI (0.52.11)

Expand All @@ -28,7 +27,6 @@ DEPENDENCIES:
- Masonry (~> 1.1.0)
- MASPreferences (~> 1.4.1)
- "MASShortcut (from `[email protected]:AkaShark/MASShortcut.git`, branch `double_click_modifier`)"
- MJExtension (~> 3.2.1)
- ReactiveObjC (~> 3.1.1)
- SwiftFormat/CLI (~> 0.52.11)

Expand All @@ -39,7 +37,6 @@ SPEC REPOS:
- KVOController
- Masonry
- MASPreferences
- MJExtension
- ReactiveObjC
- SwiftFormat

Expand All @@ -60,10 +57,9 @@ SPEC CHECKSUMS:
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MASPreferences: 1ba2deb14086792857af44d22846fc4aae477fd9
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
MJExtension: 88e0900751b6cac8de1cf724ca9838a0b28d5acb
ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
SwiftFormat: 2ca3d0b75754193f0f3ba532291f25ae08dd1e42

PODFILE CHECKSUM: e9bdddca2d7cf15e00b0d57cb178bbfc2b1f43f9
PODFILE CHECKSUM: 33cdb145e7fdb7bf5895f75865a1ef7987ef9a17

COCOAPODS: 1.14.2
19 changes: 0 additions & 19 deletions Pods/MJExtension/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions Pods/MJExtension/MJExtension/MJExtension.h

This file was deleted.

111 changes: 0 additions & 111 deletions Pods/MJExtension/MJExtension/MJExtensionConst.h

This file was deleted.

27 changes: 0 additions & 27 deletions Pods/MJExtension/MJExtension/MJExtensionConst.m

This file was deleted.

16 changes: 0 additions & 16 deletions Pods/MJExtension/MJExtension/MJFoundation.h

This file was deleted.

Loading

0 comments on commit 1a6e74d

Please sign in to comment.