fix

PostHog · Oct 25, 2023 · 4c05b4f · 4c05b4f
2 parents 5833e9e + 9ee9b7b
commit 4c05b4f
Show file tree

Hide file tree

Showing 18 changed files with 706 additions and 158 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ Carthage/Build
 #           - Also handy if you have a large number of dependant pods
 #           - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
 Pods/
+*.lock
 
 ### Swift ###
 # Xcode
@@ -69,9 +70,8 @@ playground.xcworkspace
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-# Pods/
 # Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
+*.xcworkspace
 
 # Carthage
 # Add this line if you want to avoid checking in source code from Carthage dependencies.

diff --git a/Podfile b/Podfile
diff --git a/PostHog.podspec b/PostHog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "PostHog"
-  s.version          = "2.1.0"
+  s.version          = "3.0.0-alpha.1"
   s.summary          = "The hassle-free way to add posthog to your iOS app."
 
   s.description      = <<-DESC
@@ -10,19 +10,18 @@ Pod::Spec.new do |s|
 
   s.homepage         = "http://posthog.com/"
   s.license          =  { :type => 'MIT' }
-  s.author           = { "PostHog" => "tim@posthog.com" }
+  s.author           = { "PostHog" => "engineering@posthog.com" }
   s.source           = { :git => "https://github.com/PostHog/posthog-ios.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/PostHog'
 
-  s.ios.deployment_target = '11.0'
-  s.tvos.deployment_target = '11.0'
+  s.ios.deployment_target = '13.0'
+  s.tvos.deployment_target = '13.0'
+  s.osx.deployment_target = "10.14"
+  s.swift_versions = "5.3"
 
-  s.ios.frameworks = 'CoreTelephony'
-  s.frameworks = 'Security', 'StoreKit', 'SystemConfiguration', 'UIKit'
+  s.frameworks = 'Foundation'
 
   s.source_files = [
-    'PostHog/Classes/**/*',
-    'PostHog/Internal/**/*',
-    'PostHog/Vendor/**/*'
+    'PostHog/**/*'
   ]
 end
diff --git a/PostHog.xcodeproj/project.pbxproj b/PostHog.xcodeproj/project.pbxproj
@@ -93,6 +93,13 @@
 			remoteGlobalIDString = 690FF0422AE7DB3600A0B06B;
 			remoteInfo = PostHogExampleWithSPM;
 		};
+		690FF0332AE7C5BB00A0B06B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 690FF02F2AE7C5BA00A0B06B /* PostHogExampleWithPods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 690FF01E2AE7C5B900A0B06B;
+			remoteInfo = PostHogExampleWithPods;
+		};
 		69278D4D2AE6BC9000BB541A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3AC745AC296D6FE60025C109 /* Project object */;
@@ -160,8 +167,12 @@
 		3AE3FB48299391DF00AFFC18 /* PostHogStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogStorage.swift; sourceTree = "<group>"; };
 		3AE3FB4A2993A68500AFFC18 /* StorageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageTest.swift; sourceTree = "<group>"; };
 		3AE3FB4D2993D1D600AFFC18 /* PostHogSessionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogSessionManager.swift; sourceTree = "<group>"; };
+<<<<<<< HEAD
 		690FF0532AE7DB3700A0B06B /* PostHogExampleWithSPM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PostHogExampleWithSPM.xcodeproj; path = PostHogExampleWithSPM/PostHogExampleWithSPM.xcodeproj; sourceTree = "<group>"; };
 		690FF05E2AE7E2D400A0B06B /* Data+Gzip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Gzip.swift"; sourceTree = "<group>"; };
+=======
+		690FF02F2AE7C5BA00A0B06B /* PostHogExampleWithPods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PostHogExampleWithPods.xcodeproj; path = PostHogExampleWithPods/PostHogExampleWithPods.xcodeproj; sourceTree = "<group>"; };
+>>>>>>> v3.0.0
 		69261D122AD5685B00232EC7 /* PostHogFeatureFlags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogFeatureFlags.swift; sourceTree = "<group>"; };
 		69261D182AD9673500232EC7 /* PostHogBatchUploadInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogBatchUploadInfo.swift; sourceTree = "<group>"; };
 		69261D1A2AD9678C00232EC7 /* PostHogEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogEvent.swift; sourceTree = "<group>"; };
@@ -281,7 +292,11 @@
 		3AC745AB296D6FE60025C109 = {
 			isa = PBXGroup;
 			children = (
+<<<<<<< HEAD
 				690FF0532AE7DB3700A0B06B /* PostHogExampleWithSPM.xcodeproj */,
+=======
+				690FF02F2AE7C5BA00A0B06B /* PostHogExampleWithPods.xcodeproj */,
+>>>>>>> v3.0.0
 				3AAFB13129C0C699004F485B /* Package.swift */,
 				3AC745B7296D6FE60025C109 /* PostHog */,
 				3AC745C3296D6FE60025C109 /* PostHogTests */,
@@ -341,10 +356,17 @@
 			path = PostHogTests;
 			sourceTree = "<group>";
 		};
+<<<<<<< HEAD
 		690FF0542AE7DB3700A0B06B /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				690FF0582AE7DB3700A0B06B /* PostHogExampleWithSPM.app */,
+=======
+		690FF0302AE7C5BA00A0B06B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				690FF0342AE7C5BB00A0B06B /* PostHogExampleWithPods.app */,
+>>>>>>> v3.0.0
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -525,8 +547,13 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
+<<<<<<< HEAD
 					ProductGroup = 690FF0542AE7DB3700A0B06B /* Products */;
 					ProjectRef = 690FF0532AE7DB3700A0B06B /* PostHogExampleWithSPM.xcodeproj */;
+=======
+					ProductGroup = 690FF0302AE7C5BA00A0B06B /* Products */;
+					ProjectRef = 690FF02F2AE7C5BA00A0B06B /* PostHogExampleWithPods.xcodeproj */;
+>>>>>>> v3.0.0
 				},
 			);
 			projectRoot = "";
@@ -540,11 +567,19 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+<<<<<<< HEAD
 		690FF0582AE7DB3700A0B06B /* PostHogExampleWithSPM.app */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.application;
 			path = PostHogExampleWithSPM.app;
 			remoteRef = 690FF0572AE7DB3700A0B06B /* PBXContainerItemProxy */;
+=======
+		690FF0342AE7C5BB00A0B06B /* PostHogExampleWithPods.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = PostHogExampleWithPods.app;
+			remoteRef = 690FF0332AE7C5BB00A0B06B /* PBXContainerItemProxy */;
+>>>>>>> v3.0.0
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */

diff --git a/PostHog.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PostHog.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/PostHog/PostHogDataMode.swift b/PostHog/PostHogDataMode.swift
diff --git a/PostHog/PostHogVersion.swift b/PostHog/PostHogVersion.swift
@@ -7,4 +7,4 @@
 
 import Foundation
 
-let postHogVersion = "3.0.0"
+let postHogVersion = "3.0.0-alpha.1"
diff --git a/PostHogExampleWithPods/Podfile b/PostHogExampleWithPods/Podfile
@@ -0,0 +1,7 @@
+platform :ios, '16.0'
+
+use_frameworks!
+
+target 'PostHogExampleWithPods' do
+  pod 'PostHog', :path => '../'
+end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		import Foundation

		let postHogVersion = "3.0.0"
		let postHogVersion = "3.0.0-alpha.1"