Merge pull request #2 from PostHog/master

Merge from master

.vscode/settings.json

@@ -0,0 +1 @@
+{}

CHANGELOG.md

@@ -1,25 +1,65 @@
+## 1.4.4 - 2021-11-19
+
+Make enabled property public.
+
+## 1.4.3 - 2021-11-02
+
+Add `shouldSendDeviceID` config option.
+
+## 1.4.2 - 2021-09-17
+
+Fix Info.plist warning for Swift Package Manager
+
+## 1.4.1 - 2021-09-17
+
+Fix warning with Swift Package Manager
+
+## 1.4.0 - 2021-05-27
+
+Fix support for Swift Package Manager
+
+## 1.3.0 - 2021-05-11
+
+In the `identify` call the `distinct_id` field can no longer be `nil`.
+
+## 1.2.3 - 2021-02-24
+
+Renamed functions which were causing conflicts with Segment iOS library
+
+## 1.2.2 - 2020-02-22
+
+Swift Package Manager
+
 ## 1.2.1 - 2020-12-18
+
 Also remove the `enableAdvertisingCapturing` and `adSupportBlock` config options
 
 ## 1.2.0 - 2020-12-18
+
 Completely remove reference to the AdSupport framework
 
 ## 1.1.0 - 2020-10-03
+
 Shift responsibility of IDFA collection to clients ([#5](https://github.com/PostHog/posthog-ios/pull/5))
 by removing any references to Apple's AdSupport framework from the library. In case you need to
 use the $device_advertisingId field, [see here](https://posthog.com/docs/integrations/ios-integration) for how to enable it.
 
 ## 1.0.5 - 2020-08-25
+
 Add Swift Package Manager support
 
 ## 1.0.4 - 2020-05-25
+
 Fix selector typo with ad capturing, which resulted in a crash when moving your app to the foreground.
 
 ## 1.0.3 - 2020-05-20
-Support passing in custom library version and name. This is used in the React Native client. 
+
+Support passing in custom library version and name. This is used in the React Native client.
 
 ## 1.0.2 - 2020-05-18
-Fix issues with launching the library and screen tracking. 
+
+Fix issues with launching the library and screen tracking.
 
 ## 1.0.0 - 2020-04-22
+
 First Release.

Makefile

@@ -2,7 +2,7 @@ XC_ARGS := -workspace PostHog.xcworkspace GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
 IOS_XCARGS := $(XC_ARGS) -destination "platform=iOS Simulator,name=iPhone 11" -sdk iphonesimulator
 TVOS_XCARGS := $(XC_ARGS) -destination "platform=tvOS Simulator,name=Apple TV"
 XC_BUILD_ARGS := -scheme PostHog ONLY_ACTIVE_ARCH=NO
-XC_TEST_ARGS := GCC_GENERATE_TEST_COVERAGE_FILES=YES SWIFT_VERSION=4.0 RUN_E2E_TESTS=$(RUN_E2E_TESTS) WEBHOOK_AUTH_USERNAME=$(WEBHOOK_AUTH_USERNAME)
+XC_TEST_ARGS := GCC_GENERATE_TEST_COVERAGE_FILES=YES SWIFT_VERSION=4.2 RUN_E2E_TESTS=$(RUN_E2E_TESTS) WEBHOOK_AUTH_USERNAME=$(WEBHOOK_AUTH_USERNAME)
 
 bootstrap:
 	.buildscript/bootstrap.sh

Package.swift

@@ -1,22 +1,35 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 
 import PackageDescription
 
 let package = Package(
     name: "PostHog",
+    platforms: [
+        .iOS(.v13), .tvOS(.v13)
+    ],
     products: [
-        .library(name: "PostHog", targets: ["PostHog"]),
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "PostHog",
+            targets: ["PostHog"]),
     ],
     targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "PostHog",
             dependencies: [],
-			path: "PostHog"
-			),
-//        .testTarget(
-//            name: "PostHogTests",
-//            dependencies: ["PostHog"],
-//            path: "PostHogTests"
-//        ),
+            path: "PostHog/",
+            exclude: ["Info.plist"],
+            sources: ["Classes",
+                      "Internal",
+                      "Vendor"],
+            publicHeadersPath: "Classes",
+            cSettings: [
+                .headerSearchPath("Vendor"),
+                .headerSearchPath("Internal"),
+                .headerSearchPath("Classes"),
+            ]
+        )
     ]
 )

Podfile

@@ -1,6 +1,6 @@
 def shared_testing_pods
     pod 'Quick', '~> 1.2.0'
-    pod 'Nimble', '~> 7.3.4'
+    pod 'Nimble', '~> 9.2.0'
     pod 'Nocilla', '~> 0.11.0'
     pod 'Alamofire', '~> 4.5'
     pod 'Alamofire-Synchronous', '~> 4.0'

Podfile.lock

@@ -2,14 +2,14 @@ PODS:
   - Alamofire (4.6.0)
   - Alamofire-Synchronous (4.0.0):
     - Alamofire (~> 4.0)
-  - Nimble (7.3.4)
+  - Nimble (9.2.0)
   - Nocilla (0.11.0)
   - Quick (1.2.0)
 
 DEPENDENCIES:
   - Alamofire (~> 4.5)
   - Alamofire-Synchronous (~> 4.0)
-  - Nimble (~> 7.3.4)
+  - Nimble (~> 9.2.0)
   - Nocilla (~> 0.11.0)
   - Quick (~> 1.2.0)
 
@@ -24,10 +24,10 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
   Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50
-  Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
+  Nimble: 4f4a345c80b503b3ea13606a4f98405974ee4d0b
   Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
 
-PODFILE CHECKSUM: d830b1d570a19251d3a87ad6ee23f22be3c42db7
+PODFILE CHECKSUM: c797bf85ec73ef7d45907ff10078448b6943c16f
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.1

PostHog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "PostHog"
-  s.version          = "1.2.1"
+  s.version          = "1.4.4"
   s.summary          = "The hassle-free way to add posthog to your iOS app."
 
   s.description      = <<-DESC
@@ -14,14 +14,15 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/PostHog/posthog-ios.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/PostHogHQ'
 
-  s.ios.deployment_target = '7.0'
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
 
   s.ios.frameworks = 'CoreTelephony'
   s.frameworks = 'Security', 'StoreKit', 'SystemConfiguration', 'UIKit'
 
   s.source_files = [
     'PostHog/Classes/**/*',
+    'PostHog/Internal/**/*',
     'PostHog/Vendor/**/*'
   ]
 end