Skip to content

Commit 70b798c

Browse files
mokagiomokagio
committed
Move a couple more files
1 parent 0412d8d commit 70b798c

File tree

5 files changed

+151
-11
lines changed

5 files changed

+151
-11
lines changed

‎Package.resolved

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"pins" : [
3+
{
4+
"identity" : "alamofire",
5+
"kind" : "remoteSourceControl",
6+
"location" : "https://github.com/Alamofire/Alamofire",
7+
"state" : {
8+
"revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a",
9+
"version" : "5.9.1"
10+
}
11+
},
12+
{
13+
"identity" : "collectionconcurrencykit",
14+
"kind" : "remoteSourceControl",
15+
"location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git",
16+
"state" : {
17+
"revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95",
18+
"version" : "0.2.0"
19+
}
20+
},
21+
{
22+
"identity" : "cryptoswift",
23+
"kind" : "remoteSourceControl",
24+
"location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
25+
"state" : {
26+
"revision" : "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c",
27+
"version" : "1.8.1"
28+
}
29+
},
30+
{
31+
"identity" : "ohhttpstubs",
32+
"kind" : "remoteSourceControl",
33+
"location" : "https://github.com/AliSoftware/OHHTTPStubs",
34+
"state" : {
35+
"revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
36+
"version" : "9.1.0"
37+
}
38+
},
39+
{
40+
"identity" : "sourcekitten",
41+
"kind" : "remoteSourceControl",
42+
"location" : "https://github.com/jpsim/SourceKitten.git",
43+
"state" : {
44+
"revision" : "b6dc09ee51dfb0c66e042d2328c017483a1a5d56",
45+
"version" : "0.34.1"
46+
}
47+
},
48+
{
49+
"identity" : "swift-argument-parser",
50+
"kind" : "remoteSourceControl",
51+
"location" : "https://github.com/apple/swift-argument-parser.git",
52+
"state" : {
53+
"revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
54+
"version" : "1.2.3"
55+
}
56+
},
57+
{
58+
"identity" : "swift-syntax",
59+
"kind" : "remoteSourceControl",
60+
"location" : "https://github.com/apple/swift-syntax.git",
61+
"state" : {
62+
"revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036",
63+
"version" : "509.0.2"
64+
}
65+
},
66+
{
67+
"identity" : "swiftlint",
68+
"kind" : "remoteSourceControl",
69+
"location" : "https://github.com/realm/SwiftLint",
70+
"state" : {
71+
"revision" : "f17a4f9dfb6a6afb0408426354e4180daaf49cee",
72+
"version" : "0.54.0"
73+
}
74+
},
75+
{
76+
"identity" : "swiftytexttable",
77+
"kind" : "remoteSourceControl",
78+
"location" : "https://github.com/scottrhoyt/SwiftyTextTable.git",
79+
"state" : {
80+
"revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
81+
"version" : "0.9.0"
82+
}
83+
},
84+
{
85+
"identity" : "swxmlhash",
86+
"kind" : "remoteSourceControl",
87+
"location" : "https://github.com/drmohundro/SWXMLHash.git",
88+
"state" : {
89+
"revision" : "a853604c9e9a83ad9954c7e3d2a565273982471f",
90+
"version" : "7.0.2"
91+
}
92+
},
93+
{
94+
"identity" : "wordpress-ios-shared",
95+
"kind" : "remoteSourceControl",
96+
"location" : "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git",
97+
"state" : {
98+
"branch" : "mokagio/swiftlint-read-as-dependency",
99+
"revision" : "422950b28f01d7cc11218e7d70a6cd65004d23ae"
100+
}
101+
},
102+
{
103+
"identity" : "wpxmlrpc",
104+
"kind" : "remoteSourceControl",
105+
"location" : "https://github.com/wordpress-mobile/wpxmlrpc",
106+
"state" : {
107+
"revision" : "bfc413d336bdeaab89e62dc483380baa99b2257e",
108+
"version" : "0.10.0"
109+
}
110+
},
111+
{
112+
"identity" : "yams",
113+
"kind" : "remoteSourceControl",
114+
"location" : "https://github.com/jpsim/Yams.git",
115+
"state" : {
116+
"revision" : "8a835d918245ca22f36663dd3862138805d7f707",
117+
"version" : "5.1.0"
118+
}
119+
}
120+
],
121+
"version" : 2
122+
}

‎Package.swift

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,32 @@ import PackageDescription
44

55
let package = Package(
66
name: "WordPressKit",
7-
platforms: [.iOS(.v13)],
7+
platforms: [
8+
.iOS(.v13),
9+
// The package(s) are meant for iOS only, but the use of the SwiftLint plugin down the dependency chain requires specifying a compatible macOS version.
10+
.macOS(.v12),
11+
],
812
products: [
913
.library(name: "APIInterface", targets: ["APIInterface"]),
1014
.library(name: "CoreAPI", targets: ["CoreAPI"]),
1115
],
12-
dependencies: [],
16+
dependencies: [
17+
// .package(url: "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", from: "2.3.1"),
18+
// See https://github.com/wordpress-mobile/WordPress-iOS-Shared/pull/354
19+
.package(url: "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", branch: "mokagio/swiftlint-read-as-dependency"),
20+
.package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.10.0"),
21+
// Test dependencies
22+
.package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0"),
23+
.package(url: "https://github.com/Alamofire/Alamofire", from: "5.8.1"),
24+
],
1325
targets: [
1426
.target(name: "APIInterface"),
15-
.target(name: "CoreAPI"),
27+
.target(
28+
name: "CoreAPI",
29+
dependencies: [
30+
.product(name: "WordPressShared", package: "WordPress-iOS-Shared"),
31+
"wpxmlrpc"
32+
]
33+
),
1634
]
1735
)

‎Sources/WordPressKit/WordPressAPI/WordPressAPIError+NSErrorBrdige.swift renamed to ‎Sources/CoreAPI/WordPressAPIError+NSErrorBridge.swift

File renamed without changes.

‎Sources/WordPressKit/WordPressAPI/WordPressComRestApi.swift renamed to ‎Sources/CoreAPI/WordPressComRestApi.swift

File renamed without changes.

‎WordPressKit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
3FE2E94F2BB29A1B002CA2E1 /* FilePart.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FE2E94D2BB29A1B002CA2E1 /* FilePart.m */; };
7373
3FE2E9502BB29A1B002CA2E1 /* FilePart.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE2E94E2BB29A1B002CA2E1 /* FilePart.h */; settings = {ATTRIBUTES = (Public, ); }; };
7474
3FE2E9672BBEB8D2002CA2E1 /* WordPressComRESTAPIVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE2E9662BBEB8D2002CA2E1 /* WordPressComRESTAPIVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
75+
3FE2E97B2BC3A332002CA2E1 /* WordPressAPIError+NSErrorBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE2E9792BC3A332002CA2E1 /* WordPressAPIError+NSErrorBridge.swift */; };
76+
3FE2E97C2BC3A332002CA2E1 /* WordPressComRestApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE2E97A2BC3A332002CA2E1 /* WordPressComRestApi.swift */; };
7577
3FFCC0412BA995290051D229 /* Date+WordPressComTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FFCC0402BA995290051D229 /* Date+WordPressComTests.swift */; };
7678
3FFCC0472BAA6EF40051D229 /* NSDate+WordPressCom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FFCC0462BAA6EF40051D229 /* NSDate+WordPressCom.swift */; };
7779
3FFCC0492BAB98130051D229 /* DateFormatter+WordPressCom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FFCC0482BAB98130051D229 /* DateFormatter+WordPressCom.swift */; };
@@ -179,7 +181,6 @@
179181
4A3239682B74319400EFD2A8 /* self-hosted-plugins-install.json in Resources */ = {isa = PBXBuildFile; fileRef = 4A3239672B74319400EFD2A8 /* self-hosted-plugins-install.json */; };
180182
4A40F6552B2A5A1A0015DA77 /* WordPressAPIErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A40F6542B2A5A1A0015DA77 /* WordPressAPIErrorTests.swift */; };
181183
4A57A6812B549144008D0660 /* WordPressComRestApiTests+Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57A6802B549144008D0660 /* WordPressComRestApiTests+Error.swift */; };
182-
4A57A6832B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57A6822B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift */; };
183184
4A57A6872B54C68C008D0660 /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A57A6852B54C68C008D0660 /* Constants.h */; settings = {ATTRIBUTES = (Public, ); }; };
184185
4A57A6882B54C68C008D0660 /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A57A6862B54C68C008D0660 /* Constants.m */; };
185186
4A5BC1A82B59DE6600C7D037 /* Either.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A5BC1A72B59DE6600C7D037 /* Either.swift */; };
@@ -488,7 +489,6 @@
488489
93BD27721EE737A9002BB00B /* ServiceRemoteWordPressXMLRPC.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BD276E1EE737A8002BB00B /* ServiceRemoteWordPressXMLRPC.m */; };
489490
93BD277C1EE73944002BB00B /* HTTPAuthenticationAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD27741EE73944002BB00B /* HTTPAuthenticationAlertController.swift */; };
490491
93BD277F1EE73944002BB00B /* WordPressComOAuthClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD27771EE73944002BB00B /* WordPressComOAuthClient.swift */; };
491-
93BD27801EE73944002BB00B /* WordPressComRestApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD27781EE73944002BB00B /* WordPressComRestApi.swift */; };
492492
93BD27811EE73944002BB00B /* WordPressOrgXMLRPCApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */; };
493493
93BD27821EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD277A1EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift */; };
494494
93BD27831EE73944002BB00B /* WordPressRSDParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */; };
@@ -817,6 +817,8 @@
817817
3FE2E94D2BB29A1B002CA2E1 /* FilePart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilePart.m; sourceTree = "<group>"; };
818818
3FE2E94E2BB29A1B002CA2E1 /* FilePart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePart.h; sourceTree = "<group>"; };
819819
3FE2E9662BBEB8D2002CA2E1 /* WordPressComRESTAPIVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordPressComRESTAPIVersion.h; sourceTree = "<group>"; };
820+
3FE2E9792BC3A332002CA2E1 /* WordPressAPIError+NSErrorBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WordPressAPIError+NSErrorBridge.swift"; sourceTree = "<group>"; };
821+
3FE2E97A2BC3A332002CA2E1 /* WordPressComRestApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressComRestApi.swift; sourceTree = "<group>"; };
820822
3FFCC0402BA995290051D229 /* Date+WordPressComTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+WordPressComTests.swift"; sourceTree = "<group>"; };
821823
3FFCC0462BAA6EF40051D229 /* NSDate+WordPressCom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDate+WordPressCom.swift"; sourceTree = "<group>"; };
822824
3FFCC0482BAB98130051D229 /* DateFormatter+WordPressCom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+WordPressCom.swift"; sourceTree = "<group>"; };
@@ -924,7 +926,6 @@
924926
4A3239672B74319400EFD2A8 /* self-hosted-plugins-install.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "self-hosted-plugins-install.json"; sourceTree = "<group>"; };
925927
4A40F6542B2A5A1A0015DA77 /* WordPressAPIErrorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressAPIErrorTests.swift; sourceTree = "<group>"; };
926928
4A57A6802B549144008D0660 /* WordPressComRestApiTests+Error.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WordPressComRestApiTests+Error.swift"; sourceTree = "<group>"; };
927-
4A57A6822B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WordPressAPIError+NSErrorBrdige.swift"; sourceTree = "<group>"; };
928929
4A57A6852B54C68C008D0660 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
929930
4A57A6862B54C68C008D0660 /* Constants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
930931
4A5BC1A72B59DE6600C7D037 /* Either.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Either.swift; sourceTree = "<group>"; };
@@ -1239,7 +1240,6 @@
12391240
93BD276E1EE737A8002BB00B /* ServiceRemoteWordPressXMLRPC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServiceRemoteWordPressXMLRPC.m; sourceTree = "<group>"; };
12401241
93BD27741EE73944002BB00B /* HTTPAuthenticationAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPAuthenticationAlertController.swift; sourceTree = "<group>"; };
12411242
93BD27771EE73944002BB00B /* WordPressComOAuthClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressComOAuthClient.swift; sourceTree = "<group>"; };
1242-
93BD27781EE73944002BB00B /* WordPressComRestApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressComRestApi.swift; sourceTree = "<group>"; };
12431243
93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressOrgXMLRPCApi.swift; sourceTree = "<group>"; };
12441244
93BD277A1EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressOrgXMLRPCValidator.swift; sourceTree = "<group>"; };
12451245
93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WordPressRSDParser.swift; sourceTree = "<group>"; };
@@ -1565,13 +1565,11 @@
15651565
3FFCC04E2BABA6E60051D229 /* Date+WordPressCom.swift */,
15661566
3FFCC0482BAB98130051D229 /* DateFormatter+WordPressCom.swift */,
15671567
93BD27771EE73944002BB00B /* WordPressComOAuthClient.swift */,
1568-
93BD27781EE73944002BB00B /* WordPressComRestApi.swift */,
15691568
93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */,
15701569
93BD277A1EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift */,
15711570
93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */,
15721571
4A11239D2B1926D1004690CF /* HTTPClient.swift */,
15731572
4A11239B2B1926B7004690CF /* HTTPRequestBuilder.swift */,
1574-
4A57A6822B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift */,
15751573
);
15761574
path = WordPressAPI;
15771575
sourceTree = "<group>";
@@ -2053,6 +2051,8 @@
20532051
isa = PBXGroup;
20542052
children = (
20552053
4A1123992B19269A004690CF /* WordPressAPIError.swift */,
2054+
3FE2E9792BC3A332002CA2E1 /* WordPressAPIError+NSErrorBridge.swift */,
2055+
3FE2E97A2BC3A332002CA2E1 /* WordPressComRestApi.swift */,
20562056
);
20572057
path = CoreAPI;
20582058
sourceTree = "<group>";
@@ -3236,7 +3236,6 @@
32363236
0CED1FE82B617CF300E6DD52 /* AtomicSiteServiceRemote.swift in Sources */,
32373237
93BD277F1EE73944002BB00B /* WordPressComOAuthClient.swift in Sources */,
32383238
740B23B91F17EC7300067A2A /* PostServiceRemoteREST.m in Sources */,
3239-
93BD27801EE73944002BB00B /* WordPressComRestApi.swift in Sources */,
32403239
3FFCC04F2BABA6E60051D229 /* Date+WordPressCom.swift in Sources */,
32413240
404057D2221C56AB0060250C /* StatsTopCountryTimeIntervalData.swift in Sources */,
32423241
E11C2AD21FA77FB90023BDE2 /* SitePlugin.swift in Sources */,
@@ -3246,6 +3245,7 @@
32463245
74E229501F1E741B0085F7F2 /* RemotePublicizeConnection.swift in Sources */,
32473246
40E7FEB722106A8D0032834E /* StatsCommentsInsight.swift in Sources */,
32483247
9856BE962630B5C200C12FEB /* RemoteUser+Likes.swift in Sources */,
3248+
3FE2E97B2BC3A332002CA2E1 /* WordPressAPIError+NSErrorBridge.swift in Sources */,
32493249
57BCD3D426209D9500292CB3 /* AppTransportSecuritySettings.swift in Sources */,
32503250
9311A6891F22625A00704AC9 /* TaxonomyServiceRemoteREST.m in Sources */,
32513251
9AB6D647218705E90008F274 /* RemoteDiff.swift in Sources */,
@@ -3376,11 +3376,11 @@
33763376
436D563C2118E18D00CEAA33 /* WPState.swift in Sources */,
33773377
439A44DA2107C93000795ED7 /* RemotePlan_ApiVersion1_3.swift in Sources */,
33783378
93BD27811EE73944002BB00B /* WordPressOrgXMLRPCApi.swift in Sources */,
3379-
4A57A6832B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift in Sources */,
33803379
439A44D62107C66A00795ED7 /* JSONDecoderExtension.swift in Sources */,
33813380
0C9CD7992B9A107E0045BE03 /* RemotePostParameters.swift in Sources */,
33823381
B5A4822B20AC6C0B009D95F6 /* WPKitLogging.swift in Sources */,
33833382
B5A4822E20AC6C1A009D95F6 /* WPKitLogging.m in Sources */,
3383+
3FE2E97C2BC3A332002CA2E1 /* WordPressComRestApi.swift in Sources */,
33843384
FE6C673C2BB739950083ECAB /* NSAttributedString+extensions.swift in Sources */,
33853385
7430C9A61F1927180051B8E6 /* ReaderSiteServiceRemote.m in Sources */,
33863386
FEE4EF57272FDD4B003CDA3C /* RemoteCommentV2.swift in Sources */,

0 commit comments

Comments
 (0)