Parsely · crazytonyli · Apr 23, 2023 · Apr 19, 2023 · Apr 19, 2023 · Apr 19, 2023
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -30,21 +30,13 @@ jobs:
     runs-on: ${{ matrix.macos }}
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/cache@v2
-      with:
-        path: Pods
-        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-pods-
     - uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: ${{ matrix.xcode }}
-    - name: CocoaPod Install
-      run: pod install
     - name: Build and Test
       run: |
         xcodebuild test \
-          -workspace ParselyDemo.xcworkspace \
+          -project Demo/ParselyDemo.xcodeproj \
           -scheme ParselyDemo \
           -sdk iphonesimulator \
           -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \

diff --git a/Demo/ParselyDemo.xcodeproj/project.pbxproj b/Demo/ParselyDemo.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Demo/ParselyDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/ParselyDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/...shareddata/xcschemes/ParselyDemo.xcscheme → ...shareddata/xcschemes/ParselyDemo.xcscheme b/...shareddata/xcschemes/ParselyDemo.xcscheme → ...shareddata/xcschemes/ParselyDemo.xcscheme
@@ -38,7 +38,7 @@
       </MacroExpansion>
       <TestPlans>
          <TestPlanReference
-            reference = "container:ParselyTrackerTests/UnitTests.xctestplan"
+           reference = "container:../Tests/UnitTests.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>

diff --git a/...reddata/xcschemes/ParselyTracker.xcscheme → ...reddata/xcschemes/ParselyTracker.xcscheme b/...reddata/xcschemes/ParselyTracker.xcscheme → ...reddata/xcschemes/ParselyTracker.xcscheme
diff --git a/ParselyDemo/AnalyticsSDK.entitlements → Demo/ParselyDemo/AnalyticsSDK.entitlements b/ParselyDemo/AnalyticsSDK.entitlements → Demo/ParselyDemo/AnalyticsSDK.entitlements
diff --git a/ParselyDemo/AppDelegate.swift → Demo/ParselyDemo/AppDelegate.swift b/ParselyDemo/AppDelegate.swift → Demo/ParselyDemo/AppDelegate.swift
@@ -1,5 +1,5 @@
 import UIKit
-import ParselyTracker
+import ParselyAnalytics
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets.xcassets/first.imageset/Contents.json → ...ets.xcassets/first.imageset/Contents.json b/...ets.xcassets/first.imageset/Contents.json → ...ets.xcassets/first.imageset/Contents.json
diff --git a/.../Assets.xcassets/first.imageset/first.pdf → .../Assets.xcassets/first.imageset/first.pdf b/.../Assets.xcassets/first.imageset/first.pdf → .../Assets.xcassets/first.imageset/first.pdf
diff --git a/...ts.xcassets/second.imageset/Contents.json → ...ts.xcassets/second.imageset/Contents.json b/...ts.xcassets/second.imageset/Contents.json → ...ts.xcassets/second.imageset/Contents.json
diff --git a/...ssets.xcassets/second.imageset/second.pdf → ...ssets.xcassets/second.imageset/second.pdf b/...ssets.xcassets/second.imageset/second.pdf → ...ssets.xcassets/second.imageset/second.pdf
diff --git a/...lyDemo/Base.lproj/LaunchScreen.storyboard → ...lyDemo/Base.lproj/LaunchScreen.storyboard b/...lyDemo/Base.lproj/LaunchScreen.storyboard → ...lyDemo/Base.lproj/LaunchScreen.storyboard
diff --git a/ParselyDemo/Base.lproj/Main.storyboard → Demo/ParselyDemo/Base.lproj/Main.storyboard b/ParselyDemo/Base.lproj/Main.storyboard → Demo/ParselyDemo/Base.lproj/Main.storyboard
diff --git a/ParselyDemo/FirstViewController.swift → Demo/ParselyDemo/FirstViewController.swift b/ParselyDemo/FirstViewController.swift → Demo/ParselyDemo/FirstViewController.swift
@@ -1,6 +1,6 @@
 import UIKit
 import os.log
-import ParselyTracker
+import ParselyAnalytics
 
 class FirstViewController: UIViewController {
     let delegate = UIApplication.shared.delegate as! AppDelegate

diff --git a/ParselyDemo/Info.plist → Demo/ParselyDemo/Info.plist b/ParselyDemo/Info.plist → Demo/ParselyDemo/Info.plist
diff --git a/ParselyDemo/SecondViewController.swift → Demo/ParselyDemo/SecondViewController.swift b/ParselyDemo/SecondViewController.swift → Demo/ParselyDemo/SecondViewController.swift
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -13,20 +13,22 @@ let package = Package(
             targets: ["ParselyAnalytics"]
         ),
     ],
-    dependencies: [],
+    dependencies: [
+        .package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "12.0.0"))
+    ],
     targets: [
         .target(
             name: "ParselyAnalytics",
             dependencies: [],
-            path: "ParselyTracker",
+            path: "Sources",
             exclude: ["Info.plist"],
             resources: []
         ),
         .testTarget(
             name: "ParselyTrackerTests",
-            dependencies: ["ParselyAnalytics"],
-            path: "ParselyTrackerTests",
-            exclude: ["Info.plist"]
+            dependencies: ["ParselyAnalytics", "Nimble"],
+            path: "Tests",
+            exclude: ["Info.plist", "UnitTests.xctestplan"]
         )
     ]
 )
diff --git a/ParselyAnalytics.podspec b/ParselyAnalytics.podspec
@@ -11,6 +11,10 @@ Pod::Spec.new do |s|
   s.ios.deployment_target  = '13.0'
   s.tvos.deployment_target = '13.0'
   s.source                 = { git: 'https://github.com/Parsely/AnalyticsSDK-iOS.git', tag: s.version.to_s }
-  s.source_files           = 'ParselyTracker'
+  s.source_files           = 'Sources'
   s.framework              = 'Foundation'
+  s.test_spec 'Tests' do |test_spec|
+    test_spec.source_files = 'Tests'
+    test_spec.dependency 'Nimble'
+  end
 end