Merge branch 'dev/refactor' into 'development'

Refactor

See merge request elixxir/elixxir-dapps-sdk-swift!32

.swiftpm/xcode/xcshareddata/xcschemes/XXClient.xcscheme

+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "XXClient"
+               BuildableName = "XXClient"
+               BlueprintName = "XXClient"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "XXClientTests"
+               BuildableName = "XXClientTests"
+               BlueprintName = "XXClientTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "XXClient"
+            BuildableName = "XXClient"
+            BlueprintName = "XXClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

.swiftpm/xcode/xcshareddata/xcschemes/elixxir-dapps-sdk-swift.xcscheme

@@ -14,23 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDK"
-               BuildableName = "ElixxirDAppsSDK"
-               BlueprintName = "ElixxirDAppsSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDKTests"
-               BuildableName = "ElixxirDAppsSDKTests"
-               BlueprintName = "ElixxirDAppsSDKTests"
+               BlueprintIdentifier = "XXClient"
+               BuildableName = "XXClient"
+               BlueprintName = "XXClient"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,9 +33,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDKTests"
-               BuildableName = "ElixxirDAppsSDKTests"
-               BlueprintName = "ElixxirDAppsSDKTests"
+               BlueprintIdentifier = "XXClientTests"
+               BuildableName = "XXClientTests"
+               BlueprintName = "XXClientTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
@@ -75,9 +61,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ElixxirDAppsSDK"
-            BuildableName = "ElixxirDAppsSDK"
-            BlueprintName = "ElixxirDAppsSDK"
+            BlueprintIdentifier = "XXClient"
+            BuildableName = "XXClient"
+            BlueprintName = "XXClient"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

ElixxirDAppsSDK.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/combine-schedulers",
       "state" : {
-        "revision" : "f7c8277f05f27a5bfb2f6ecccb0bad126ffcf472",
-        "version" : "0.7.0"
+        "revision" : "8fee20f993e64bbbf22bc3e3f444758ac2d05692",
+        "version" : "0.7.2"
       }
     },
     {

Example/example-app/Package.swift

@@ -4,10 +4,8 @@ import PackageDescription
 let swiftSettings: [SwiftSetting] = [
   .unsafeFlags(
     [
-      "-Xfrontend",
-      "-debug-time-function-bodies",
-      "-Xfrontend",
-      "-debug-time-expression-type-checking",
+      "-Xfrontend", "-debug-time-function-bodies",
+      "-Xfrontend", "-debug-time-expression-type-checking",
     ],
     .when(configuration: .debug)
   ),
@@ -25,6 +23,9 @@ let package = Package(
     .library(name: "SessionFeature", targets: ["SessionFeature"]),
   ],
   dependencies: [
+    .package(
+      path: "../../"
+    ),
     .package(
       url: "https://github.com/pointfreeco/swift-composable-architecture.git",
       .upToNextMajor(from: "0.39.0")
@@ -33,10 +34,6 @@ let package = Package(
       url: "https://github.com/darrarski/swift-composable-presentation.git",
       .upToNextMajor(from: "0.5.2")
     ),
-    .package(
-      // ElixxirDAppsSDK
-      path: "../../"
-    ),
     .package(
       url: "https://github.com/kishikawakatsumi/KeychainAccess.git",
       .upToNextMajor(from: "4.2.2")
@@ -55,9 +52,9 @@ let package = Package(
         .target(name: "SessionFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "KeychainAccess", package: "KeychainAccess"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -72,8 +69,8 @@ let package = Package(
       name: "ErrorFeature",
       dependencies: [
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -90,8 +87,8 @@ let package = Package(
         .target(name: "ErrorFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -108,8 +105,8 @@ let package = Package(
         .target(name: "ErrorFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),

Example/example-app/Sources/AppFeature/App.swift

 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import LandingFeature
 import SessionFeature
 import SwiftUI
+import XXClient
 
 @main
 struct App: SwiftUI.App {

Example/example-app/Sources/AppFeature/PasswordStorage+Keychain.swift

-import ElixxirDAppsSDK
 import KeychainAccess
+import XXClient
 
 extension PasswordStorage {
   static let keychain: PasswordStorage = {

Example/example-app/Sources/LandingFeature/LandingFeature.swift

 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTestDynamicOverlay
+import XXClient
 
 public struct LandingState: Equatable {
   public init(

Example/example-app/Sources/SessionFeature/NetworkFollowerStatusView.swift

-import ElixxirDAppsSDK
 import SwiftUI
+import XXClient
 
 struct NetworkFollowerStatusView: View {
   var status: NetworkFollowerStatus?

Example/example-app/Sources/SessionFeature/SessionFeature.swift

 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTestDynamicOverlay
+import XXClient
 
 public struct SessionState: Equatable {
   public init(

Example/example-app/Sources/SessionFeature/SessionView.swift

 import ComposableArchitecture
 import ComposablePresentation
-import ElixxirDAppsSDK
 import ErrorFeature
 import SwiftUI
+import XXClient
 
 public struct SessionView: View {
   public init(store: Store<SessionState, SessionAction>) {

Example/example-app/Tests/SessionFeatureTests/SessionFeatureTests.swift

 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTest
+import XXClient
 @testable import SessionFeature
 
 final class SessionFeatureTests: XCTestCase {

Package.swift

@@ -5,10 +5,8 @@ import PackageDescription
 let swiftSettings: [SwiftSetting] = [
   .unsafeFlags(
     [
-      "-Xfrontend",
-      "-debug-time-function-bodies",
-      "-Xfrontend",
-      "-debug-time-expression-type-checking",
+      "-Xfrontend", "-debug-time-function-bodies",
+      "-Xfrontend", "-debug-time-expression-type-checking",
     ],
     .when(configuration: .debug)
   ),
@@ -21,7 +19,7 @@ let package = Package(
     .iOS(.v14),
   ],
   products: [
-    .library(name: "ElixxirDAppsSDK", targets: ["ElixxirDAppsSDK"]),
+    .library(name: "XXClient", targets: ["XXClient"]),
   ],
   dependencies: [
     .package(
@@ -35,7 +33,7 @@ let package = Package(
   ],
   targets: [
     .target(
-      name: "ElixxirDAppsSDK",
+      name: "XXClient",
       dependencies: [
         .target(name: "Bindings"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
@@ -43,9 +41,9 @@ let package = Package(
       swiftSettings: swiftSettings
     ),
     .testTarget(
-      name: "ElixxirDAppsSDKTests",
+      name: "XXClientTests",
       dependencies: [
-        .target(name: "ElixxirDAppsSDK"),
+        .target(name: "XXClient"),
         .product(name: "CustomDump", package: "swift-custom-dump"),
       ],
       swiftSettings: swiftSettings

README.md

@@ -15,7 +15,7 @@ You can find full documentation with step by step guide [here](https://xxdk-dev.
 
 ## 🚀 Quick Start
 
-Add `ElixxirDAppsSDK` library as a dependency to your project using Swift Package Manager.
+Add `XXClient` library as a dependency to your project using Swift Package Manager.
 
 ### ▶️ Instantiating cMix
 
@@ -139,7 +139,7 @@ Open `ElixxirDAppsSDK.xcworkspace` in Xcode (≥13.4).
 ```
 ElixxirDAppsSDK [Xcode Workspace]
  ├─ elixxir-dapps-sdk-swift [Swift Package]
- |   └─ ElixxirDAppsSDK [Library]
+ |   └─ XXClient [Library]
  └─ Example [Xcode Project]
      ├─ ExampleApp (iOS) [iOS App Target]
      ├─ example-app [Swift Package]
@@ -152,7 +152,7 @@ ElixxirDAppsSDK [Xcode Workspace]
 
 ### Build schemes
 
-- Use `exlixxir-dapps-sdk-swift` scheme to build and test the package with `ElixxirDAppsSDK` library.
+- Use `exlixxir-dapps-sdk-swift` scheme to build and test the package.
 - Use `ExampleApp (iOS)` to build and run the example app.
 - Use `example-app` scheme to build and test the example app package with all contained libraries.
 - Use `ExampleAppIcon` scheme with macOS target to build and preview the example app icon.