AMP-85465 Swift v2 codegen: use base SDK types

amplitude · Oct 3, 2023 · e65097c · e65097c
1 parent 9cb0092
commit e65097c
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 211 deletions.
diff --git a/ios/swift/v2/AmpliSwiftSampleApp/AmpliSwiftSampleApp.xcodeproj/project.pbxproj b/ios/swift/v2/AmpliSwiftSampleApp/AmpliSwiftSampleApp.xcodeproj/project.pbxproj
@@ -648,8 +648,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/amplitude/Amplitude-Swift";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.7.1;
+				branch = "AMP-67635-objc-support-properties";
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/...p/AmpliSwiftSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...p/AmpliSwiftSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/amplitude/Amplitude-Swift",
       "state" : {
-        "revision" : "4f9c21758a511f4e59226a6bfbcd025f61adc1a0",
-        "version" : "0.7.1"
+        "branch" : "AMP-67635-objc-support-properties",
+        "revision" : "5b6b7c917edde1cb8bf59ee7383442c8a4cd2759"
       }
     },
     {

diff --git a/ios/swift/v2/AmpliSwiftSampleApp/AmpliSwiftSampleAppTests/AmpliTests.swift b/ios/swift/v2/AmpliSwiftSampleApp/AmpliSwiftSampleAppTests/AmpliTests.swift
@@ -85,7 +85,7 @@ class AmpliTests: XCTestCase {
     func testTrackEventWithAllTypes() throws {
         let userId = "test-user-id";
         let deviceId = "test-device-id";
-        let eventOptions = EventOptions(deviceId: deviceId)
+        let eventOptions = EventOptions(userId: userId, deviceId: deviceId)
 
         initAmpliWithNewInstance("testTrackEventWithAllTypes")
         let eventCollector = EventCollectorPlugin()
@@ -99,7 +99,7 @@ class AmpliTests: XCTestCase {
                 requiredInteger: 10,
                 requiredNumber: 2.0,
                 requiredString: "required string"
-            ).options(userId: userId),
+            ),
             options: eventOptions
         )
         ampli.flush()