Fix Tests compilation for watchOS (#89)

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build buildSdk buildExample format swiftLint swiftFormat test testOnSimulator lint bootstrap releaseCocoaPods
+.PHONY: build buildSdk buildExample format swiftLint swiftFormat test testOniOSSimulator testOnMacSimulator lint bootstrap releaseCocoaPods
 
 build: buildSdk buildExample
 
@@ -16,9 +16,12 @@ swiftLint:
 swiftFormat:
 	swiftformat . --swiftversion 5.3
 
-testOnSimulator:
+testOniOSSimulator:
 	set -o pipefail && xcodebuild test -project PostHog.xcodeproj -scheme PostHog -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.0.1' | xcpretty
 
+testOnMacSimulator:
+	set -o pipefail && xcodebuild test -project PostHog.xcodeproj -scheme PostHog -destination 'platform=macOS' | xcpretty
+
 test:
 	swift test
 

Package.swift

@@ -4,7 +4,7 @@ import PackageDescription
 let package = Package(
     name: "PostHog",
     platforms: [
-        .macOS(.v10_14), .iOS(.v13), .tvOS(.v13), .watchOS(.v6),
+        .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

PostHog.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '13.0'
   s.tvos.deployment_target = '13.0'
-  s.osx.deployment_target = "10.14"
+  s.osx.deployment_target = "10.15"
   s.watchos.deployment_target = "6.0"
   s.swift_versions = "5.3"
 

PostHog.xcodeproj/xcshareddata/xcschemes/PostHogExampleMacOS.xcscheme

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "699991842AFE1B37000DCB78"
+               BuildableName = "PostHogExampleMacOS.app"
+               BlueprintName = "PostHogExampleMacOS"
+               ReferencedContainer = "container:PostHog.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "699991842AFE1B37000DCB78"
+            BuildableName = "PostHogExampleMacOS.app"
+            BlueprintName = "PostHogExampleMacOS"
+            ReferencedContainer = "container:PostHog.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "699991842AFE1B37000DCB78"
+            BuildableName = "PostHogExampleMacOS.app"
+            BlueprintName = "PostHogExampleMacOS"
+            ReferencedContainer = "container:PostHog.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

PostHog/PostHogQueue.swift

@@ -152,7 +152,12 @@ class PostHogQueue {
         }
 
         take(config.maxBatchSize) { payload in
-            self.eventHandler(payload)
+            if !payload.events.isEmpty {
+                self.eventHandler(payload)
+            } else {
+                // there's nothing to be sent
+                payload.completion(true)
+            }
         }
     }
 
@@ -199,7 +204,7 @@ class PostHogQueue {
 
             completion(PostHogConsumerPayload(events: processing) { success in
                 hedgeLog("Completed!")
-                if success {
+                if success, items.count > 0 {
                     self.fileQueue.pop(items.count)
                 }
 

PostHogExample/PostHogExample.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>

PostHogExampleMacOS/AppDelegate.swift

@@ -0,0 +1,18 @@
+import Cocoa
+import PostHog
+
+class AppDelegate: NSObject, NSApplicationDelegate {
+    func applicationDidFinishLaunching(_: Notification) {
+        let config = PostHogConfig(
+            apiKey: "_6SG-F7I1vCuZ-HdJL3VZQqjBlaSb1_20hDPwqMNnGI"
+        )
+        config.debug = true
+
+        PostHogSDK.shared.setup(config)
+//        PostHogSDK.shared.capture("Event from MacOS example!")
+    }
+
+    func applicationWillTerminate(_: Notification) {
+        // Insert code here to tear down your application
+    }
+}

PostHogExampleMacOS/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PostHogExampleMacOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,58 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PostHogExampleMacOS/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PostHogExampleMacOS/ContentView.swift

@@ -0,0 +1,24 @@
+//
+//  ContentView.swift
+//  PostHogExampleMacOS
+//
+//  Created by Manoel Aranda Neto on 10.11.23.
+//
+
+import SwiftUI
+
+struct ContentView: View {
+    var body: some View {
+        VStack {
+            Image(systemName: "globe")
+                .imageScale(.large)
+                .foregroundStyle(.tint)
+            Text("Hello, world!")
+        }
+        .padding()
+    }
+}
+
+#Preview {
+    ContentView()
+}

PostHogExampleMacOS/PostHogExampleMacOS.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

PostHogExampleMacOS/PostHogExampleMacOSApp.swift

@@ -0,0 +1,19 @@
+//
+//  PostHogExampleMacOSApp.swift
+//  PostHogExampleMacOS
+//
+//  Created by Manoel Aranda Neto on 10.11.23.
+//
+
+import SwiftUI
+
+@main
+struct PostHogExampleMacOSApp: App {
+    @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+        }
+    }
+}

PostHogExampleMacOS/Preview Content/Preview Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PostHogTests/PostHogContextTest.swift

@@ -12,13 +12,17 @@ import Quick
 
 class PostHogContextTest: QuickSpec {
     func getSut() -> PostHogContext {
-        var reachability: Reachability?
-        do {
-            reachability = try Reachability()
-        } catch {
-            // ignored
-        }
-        return PostHogContext(reachability)
+        #if !os(watchOS)
+            var reachability: Reachability?
+            do {
+                reachability = try Reachability()
+            } catch {
+                // ignored
+            }
+            return PostHogContext(reachability)
+        #else
+            return PostHogContext()
+        #endif
     }
 
     override func spec() {