Merge pull request #1199 from Automattic/lantean/wiring-simplenote-en…

…dpoints-spm Integrates SimplenoteEndpoints Swift Package
Automattic · Jul 26, 2024 · 4138485 · 4138485
2 parents e10baeb + 262e53b
commit 4138485
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 530 deletions.
diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "1f66ac352dc04da5870abacba5f42306bd560111ad295c7c60a13a7af5c25ec8",
+  "originHash" : "7f8dc02b0065be779873bdc5b585794a5005edfeb5a5e51a04644d5b3c18e322",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -19,6 +19,15 @@
         "version" : "8.28.0"
       }
     },
+    {
+      "identity" : "simplenoteendpoints-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Automattic/SimplenoteEndpoints-Swift",
+      "state" : {
+        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "simplenotefoundation-swift",
       "kind" : "remoteSourceControl",

diff --git a/Simplenote/AccountDeletionController.swift b/Simplenote/AccountDeletionController.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 @objc
 class AccountDeletionController: NSObject {

diff --git a/Simplenote/AccountRemote.swift b/Simplenote/AccountRemote.swift
diff --git a/Simplenote/AccountVerificationController.swift b/Simplenote/AccountVerificationController.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - AccountVerificationController
 //

diff --git a/Simplenote/AuthViewController+Swift.swift b/Simplenote/AuthViewController+Swift.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - AuthViewController: Interface Initialization
 //

diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
diff --git a/Simplenote/LoginRemoteProtocol.swift b/Simplenote/LoginRemoteProtocol.swift
diff --git a/Simplenote/MagicLinkAuthenticator.swift b/Simplenote/MagicLinkAuthenticator.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 
 // MARK: - Notifications

diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
diff --git a/Simplenote/RemoteConstants.swift b/Simplenote/RemoteConstants.swift
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
diff --git a/Simplenote/SignupRemote.swift b/Simplenote/SignupRemote.swift
diff --git a/Simplenote/SimperiumAuthenticatorProtocol.swift b/Simplenote/SimperiumAuthenticatorProtocol.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+import Simperium_OSX
 
 
 // MARK: - SimperiumAuthenticatorProtocol
@@ -9,3 +11,6 @@ protocol SimperiumAuthenticatorProtocol {
 
 
 extension SPAuthenticator: SimperiumAuthenticatorProtocol { }
+
+
+extension SPUser: UserProtocol { }
diff --git a/Simplenote/URLSessionProtocol.swift b/Simplenote/URLSessionProtocol.swift
diff --git a/SimplenoteTests/AccountVerificationController+TestHelpers.swift b/SimplenoteTests/AccountVerificationController+TestHelpers.swift
@@ -1,8 +1,15 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
+
 extension AccountVerificationController {
     func randomResult() -> Result<Data?, RemoteError> {
-        return Bool.random() ? .success(nil) : .failure(RemoteError.requestError(0, nil))
+        if Bool.random() {
+            return .success(nil)
+        }
+
+        let error = RemoteError(statusCode: .zero, response: nil, networkError: nil)
+        return .failure(error)
     }
 }
diff --git a/SimplenoteTests/AccountVerificationControllerTests.swift b/SimplenoteTests/AccountVerificationControllerTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 // MARK: - AccountVerificationControllerTests