WordPress-iOS Edition [Do Not Merge]

.buildkite/create-xcframeworks.sh

@@ -0,0 +1,27 @@
+ROOT="./.build/xcframeworks"
+
+rm -rf $ROOT
+
+for SDK in iphoneos iphonesimulator
+do
+xcodebuild archive \
+    -workspace WordPressKit.xcworkspace \
+    -scheme WordPressKit \
+    -archivePath "$ROOT/WordPressKit-$SDK.xcarchive" \
+    -sdk $SDK \
+    SKIP_INSTALL=NO \
+    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+    DEBUG_INFORMATION_FORMAT=DWARF
+done
+
+xcodebuild -create-xcframework \
+    -framework "$ROOT/WordPressKit-iphoneos.xcarchive/Products/Library/Frameworks/WordPressKit.framework" \
+    -framework "$ROOT/WordPressKit-iphonesimulator.xcarchive/Products/Library/Frameworks/WordPressKit.framework" \
+    -output "$ROOT/WordPressKit.xcframework"
+
+cd $ROOT
+zip -r -X WordPressKit.zip *.xcframework
+rm -rf *.xcframework
+
+swift package compute-checksum WordPressKit.zip
+cd -

.buildkite/pipeline.yml

@@ -24,16 +24,6 @@ steps:
     env: *common_env
     plugins: *common_plugins
 
-  #################
-  # Validate Podspec
-  #################
-  - label: "🔬 Validate Podspec"
-    key: "validate"
-    command: |
-      validate_podspec --patch-cocoapods
-    env: *common_env
-    plugins: *common_plugins
-
   #################
   # Linters
   #################

.gitignore

@@ -43,13 +43,13 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
-# Package.resolved
+
 # *.xcodeproj
 #
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
-
+.swiftpm
+Package.resolved
 .build/
 
 # CocoaPods

Package.swift

@@ -1,50 +1,18 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 import PackageDescription
 
 let package = Package(
     name: "WordPressKit",
-    platforms: [.iOS(.v13)],
+    platforms: [.iOS(.v15)],
     products: [
-        .library(name: "APIInterface", targets: ["APIInterface"]),
-        .library(name: "CoreAPI", targets: ["CoreAPI"]),
-    ],
-    dependencies: [
-        // .package(url: "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", from: "2.3.1"),
-        // See https://github.com/wordpress-mobile/WordPress-iOS-Shared/pull/354
-        .package(url: "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", branch: "mokagio/swiftlint-read-as-dependency"),
-        .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.10.0"),
-        // Test dependencies
-        .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0"),
-        .package(url: "https://github.com/Alamofire/Alamofire", from: "5.8.1"),
+        .library(name: "WordPressKit", targets: ["WordPressKit"]),
     ],
     targets: [
-        .target(name: "APIInterface"),
-        .target(
-            name: "CoreAPI",
-            dependencies: [
-                .target(name: "APIInterface"),
-                .product(
-                    name: "WordPressShared",
-                    package: "WordPress-iOS-Shared",
-                    // Constrain to iOS only to avoid having to explicitly set a macOS version because of this library's requirements.
-                    condition: .when(platforms: [.iOS])
-                ),
-                "wpxmlrpc"
-            ]
-        ),
-        .testTarget(
-            name: "CoreAPITests",
-            dependencies: [
-                .target(name: "CoreAPI"),
-                .product(name: "OHHTTPStubs", package: "OHHTTPStubs"),
-                .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"),
-                "Alamofire",
-            ],
-            path: "Tests/CoreAPITests",
-            resources: [
-                .process("Stubs") // Relative to path
-            ]
+        .binaryTarget(
+            name: "WordPressKit",
+            url: "https://github.com/user-attachments/files/16531883/WordPressKit.zip",
+            checksum: "ca916824c64a6061814a69a37bc9a6560aafcc35559983e945fdfa5c3bbcc23d"
         ),
     ]
 )

Podfile

@@ -8,38 +8,14 @@ use_frameworks!
 APP_IOS_DEPLOYMENT_TARGET = Gem::Version.new('13.0')
 
 platform :ios, APP_IOS_DEPLOYMENT_TARGET
+workspace './WordPressKit.xcworkspace'
 
 def swiftlint_version
   require 'yaml'
 
   YAML.load_file('.swiftlint.yml')['swiftlint_version']
 end
 
-def wordpresskit_pods
-  pod 'WordPressShared', '~> 2.0.0-beta.2'
-  pod 'NSObject-SafeExpectations', '~> 0.0.4'
-  pod 'wpxmlrpc', '~> 0.10.0'
-  pod 'UIDeviceIdentifier', '~> 2.0'
-end
-
-## WordPress Kit
-## =============
-##
-target 'WordPressKit' do
-  project 'WordPressKit.xcodeproj'
-  wordpresskit_pods
-end
-
-target 'WordPressKitTests' do
-  project 'WordPressKit.xcodeproj'
-  wordpresskit_pods
-
-  pod 'OHHTTPStubs', '~> 9.0'
-  pod 'OHHTTPStubs/Swift', '~> 9.0'
-  pod 'OCMock', '~> 3.4'
-  pod 'Alamofire', '~> 5.0'
-end
-
 abstract_target 'Tools' do
   pod 'SwiftLint', swiftlint_version
 end

Podfile.lock

@@ -1,59 +1,16 @@
 PODS:
-  - Alamofire (5.8.1)
-  - NSObject-SafeExpectations (0.0.6)
-  - OCMock (3.9.3)
-  - OHHTTPStubs (9.1.0):
-    - OHHTTPStubs/Default (= 9.1.0)
-  - OHHTTPStubs/Core (9.1.0)
-  - OHHTTPStubs/Default (9.1.0):
-    - OHHTTPStubs/Core
-    - OHHTTPStubs/JSON
-    - OHHTTPStubs/NSURLSession
-    - OHHTTPStubs/OHPathHelpers
-  - OHHTTPStubs/JSON (9.1.0):
-    - OHHTTPStubs/Core
-  - OHHTTPStubs/NSURLSession (9.1.0):
-    - OHHTTPStubs/Core
-  - OHHTTPStubs/OHPathHelpers (9.1.0)
-  - OHHTTPStubs/Swift (9.1.0):
-    - OHHTTPStubs/Default
   - SwiftLint (0.54.0)
-  - UIDeviceIdentifier (2.3.0)
-  - WordPressShared (2.0.1)
-  - wpxmlrpc (0.10.0)
 
 DEPENDENCIES:
-  - Alamofire (~> 5.0)
-  - NSObject-SafeExpectations (~> 0.0.4)
-  - OCMock (~> 3.4)
-  - OHHTTPStubs (~> 9.0)
-  - OHHTTPStubs/Swift (~> 9.0)
   - SwiftLint (= 0.54.0)
-  - UIDeviceIdentifier (~> 2.0)
-  - WordPressShared (~> 2.0.0-beta.2)
-  - wpxmlrpc (~> 0.10.0)
 
 SPEC REPOS:
   trunk:
-    - Alamofire
-    - NSObject-SafeExpectations
-    - OCMock
-    - OHHTTPStubs
     - SwiftLint
-    - UIDeviceIdentifier
-    - WordPressShared
-    - wpxmlrpc
 
 SPEC CHECKSUMS:
-  Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
-  NSObject-SafeExpectations: c01c8881cbd97efad6f668286b913cd0b7d62ab5
-  OCMock: 300b1b1b9155cb6378660b981c2557448830bdc6
-  OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
-  UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
-  WordPressShared: f93f99269258b46dad04f4e4dbf540ce2e5c1e66
-  wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
 
-PODFILE CHECKSUM: 64af6d71574c7a92d01a9446aa874e066917ebe5
+PODFILE CHECKSUM: c0da9313733b88a1d938ba6a329dd46b895c7dea
 
 COCOAPODS: 1.15.2

Sources/CoreAPI/HTTPRequestBuilder.swift

@@ -1,12 +1,12 @@
 import Foundation
-import wpxmlrpc
+@_implementationOnly import wpxmlrpc
 
 /// A builder type that appends HTTP request data to a URL.
 ///
 /// Calling this class's url related functions (the ones that changes path, query, etc) does not modify the
 /// original URL string. The URL will be perserved in the final result that's returned by the `build` function.
-final class HTTPRequestBuilder {
-    enum Method: String, CaseIterable {
+public final class HTTPRequestBuilder {
+    public enum Method: String, CaseIterable {
         case get = "GET"
         case post = "POST"
         case put = "PUT"

Sources/CoreAPI/NonceRetrieval.swift

@@ -1,5 +1,4 @@
 import Foundation
-import WordPressShared
 
 enum NonceRetrievalMethod {
     case newPostScrap

Sources/CoreAPI/WordPressAPIError.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum WordPressAPIError<EndpointError>: Error where EndpointError: LocalizedError {
+@frozen public enum WordPressAPIError<EndpointError>: Error where EndpointError: LocalizedError {
     static var unknownErrorMessage: String {
         NSLocalizedString(
             "wordpress-api.error.unknown",