Replaces Old Project Structure With New SPM Format

.gitignore

@@ -1,36 +1 @@
-## OS X Finder
 .DS_Store
-
-## Build generated
-build/
-DerivedData
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-
-## Other
-*.xccheckout
-*.moved-aside
-*.xcuserstate
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-
-# Swift Package Manager
-.build/
-
-# Carthage
-Carthage/Build
-
-### CocoaPods ###
-Pods/

Cardian.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |spec|
-  spec.name = "Cardian"
-  spec.version = "1.0.0"
-  spec.summary = "Cardian provides developers with the powerful tools they need to create data-driven health & fitness experiences for their users."
-  spec.homepage = "https://cardian.io"
-  spec.license = { type: 'Modified MIT', file: 'LICENSE' }
-  spec.authors = { "CurAegis Technologies" => 'team@cardian.io' }
-  spec.social_media_url = "https://github.com/cardian-team"
-
-  spec.platform = :ios, "12.0"
-  spec.requires_arc = true
-  spec.source = { git: "https://github.com/cardian-team/Cardian-iOS-SDK.git", tag: "v#{spec.version}", submodules: true }
-  spec.source_files = "Cardian/**/*.{h,swift}"
-  spec.swift_version = "5.0"
-
-# Dependencies
-  # spec.dependency "---", "~> 1.0.0"
-  spec.dependency “Alamofire”
-end
+spec.name         = "Cardian"
+spec.version      = "0.9.0"
+spec.summary      = "Cardian is a free service that makes it easy for mobile app developers to build data-driven, health & fitness apps."
+spec.description  = <<-DESC
+Cardian is a free service that makes it easy for mobile app developers to build data-driven, health & fitness apps. This plugin simplifies how you integrate your native iOS app with Apple HealthKit to just three lines of code.
+DESC
+spec.homepage     = "https://cardian.io"
+spec.license      = { :type => "MIT", :file => "LICENSE" }
+spec.author             = { "author" => "team@cardian.io" }
+spec.documentation_url = "https://github.com/cardian-team/Cardian-iOS-SDK"
+spec.platforms = { :ios => "12.0" }
+spec.swift_version = "5.3"
+spec.requires_arc = true
+spec.source       = { :git => "https://github.com/cardian-team/Cardian-iOS-SDK.git", :tag => "#{spec.version}", submodules: true }
+spec.source_files  = "Cardian/Sources/Cardian/**/*.{h,swift}"
+spec.xcconfig = { "SWIFT_VERSION" => "5.3" }
+spec.dependency "Alamofire"
+end

Cardian.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Alamofire",
+        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
+        "state": {
+          "branch": null,
+          "revision": "eaf6e622dd41b07b251d8f01752eab31bc811493",
+          "version": "5.4.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Cardian/Cardian.swift → Cardian/Sources/Cardian/Cardian.swift

@@ -6,4 +6,4 @@
 //  Copyright © 2020 Curaegis. All rights reserved.
 //
 
-public let CardianApp = Control.default;
+public let Cardian = Control.default;

Cardian/ConfirmationController.swift → Cardian/Sources/Cardian/ConfirmationController.swift

@@ -29,8 +29,14 @@ class ConfirmationController: BaseViewController {
     init(appName: String? = nil, actionButtonTitle: String = "Continue") {
         self.appName = appName
         self.actionButtonTitle = actionButtonTitle
-        let bundle = Bundle(for: ConfirmationController.self)
-        super.init(nibName: ConfirmationController.nibName, bundle: bundle)
+
+        #if SWIFT_PACKAGE
+           let resourceBundle = Bundle.module
+        #else
+            let resourceBundle = Bundle(for: ConfirmationController.self)
+        #endif
+
+        super.init(nibName: ConfirmationController.nibName, bundle: resourceBundle)
     }
 
     required init?(coder: NSCoder) {

Cardian/DataBreakdownController.swift → Cardian/Sources/Cardian/DataBreakdownController.swift

@@ -37,8 +37,14 @@ class DataBreakdownController: BaseViewController, UITableViewDataSource, UITabl
     // MARK: Functions
     init(dataSource: BreakdownDataSource, showDismissButton: Bool = true) {
         self.dataSource = dataSource
-        let bundle = Bundle(for: DataBreakdownController.self)
-        super.init(nibName: DataBreakdownController.nibName, bundle: bundle)
+
+        #if SWIFT_PACKAGE
+           let resourceBundle = Bundle.module
+        #else
+            let resourceBundle = Bundle(for: DataBreakdownController.self)
+        #endif
+
+        super.init(nibName: DataBreakdownController.nibName, bundle: resourceBundle)
 
 //        self.iconImage.image = icon
 //        self.dismissButton.isHidden = !showDismissButton

Cardian/DisclosureViewController.swift → Cardian/Sources/Cardian/DisclosureViewController.swift

@@ -30,8 +30,14 @@ class DisclosureViewController: BaseViewController {
     // MARK: Functions
     init(currentConfiguration: CardianConfiguration, showDismissButton: Bool = true) {
         self.currentConfiguration = currentConfiguration
-        let bundle = Bundle(for: DisclosureViewController.self)
-        super.init(nibName: DisclosureViewController.nibName, bundle: bundle)
+
+        #if SWIFT_PACKAGE
+           let resourceBundle = Bundle.module
+        #else
+            let resourceBundle = Bundle(for: DisclosureViewController.self)
+        #endif
+
+        super.init(nibName: DisclosureViewController.nibName, bundle: resourceBundle)
     }
 
     required init?(coder: NSCoder) {

Cardian/MetricDescriptionController.swift → Cardian/Sources/Cardian/MetricDescriptionController.swift

@@ -31,8 +31,14 @@ class MetricDescriptionController: BaseViewController {
     // MARK: Functions
     init(dataSource: MetricDescriptionDataSource) {
         self.dataSource = dataSource
-        let bundle = Bundle(for: MetricDescriptionController.self)
-        super.init(nibName: MetricDescriptionController.nibName, bundle: bundle)
+
+        #if SWIFT_PACKAGE
+           let resourceBundle = Bundle.module
+        #else
+            let resourceBundle = Bundle(for: MetricDescriptionController.self)
+        #endif
+
+        super.init(nibName: MetricDescriptionController.nibName, bundle: resourceBundle)
     }
 
     required init?(coder: NSCoder) {

Cardian/Tests/CardianTests/CardianTests.swift

@@ -0,0 +1,15 @@
+import XCTest
+@testable import Cardian
+
+final class CardianTests: XCTestCase {
+    func testExample() {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct
+        // results.
+        XCTAssertEqual(Cardian().text, "Hello, World!")
+    }
+
+    static var allTests = [
+        ("testExample", testExample),
+    ]
+}

Cardian/Tests/CardianTests/XCTestManifests.swift

@@ -0,0 +1,9 @@
+import XCTest
+
+#if !canImport(ObjectiveC)
+public func allTests() -> [XCTestCaseEntry] {
+    return [
+        testCase(CardianTests.allTests),
+    ]
+}
+#endif

Cardian/Tests/LinuxMain.swift

@@ -0,0 +1,7 @@
+import XCTest
+
+import CardianTests
+
+var tests = [XCTestCaseEntry]()
+tests += CardianTests.allTests()
+XCTMain(tests)