update with amplitude-core release

sojingle · sojingle · commit dff57f5c1f8b · 2025-12-09T09:40:26.000-08:00
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -16,39 +16,39 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: iOS
-            xcode: 16.1
+            xcode: 16.4
             device: "iPhone 16"
             test-destination-os: latest
 
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: iOS
-            xcode: 16.1
-            test-destination-os: 17.2
-            device: "iPhone 15"
+            xcode: 16.4
+            test-destination-os: 18.5
+            device: "iPhone 16"
           
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: macOS
-            xcode: 16.1
+            xcode: 16.4
             test-destination-os: latest
 
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: tvOS
-            xcode: 16.1
+            xcode: 16.4
             test-destination-os: latest
-            device: "Apple TV 4K (3rd generation)"
+            device: "Apple TV"
 
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: watchOS
-            xcode: 16.1
+            xcode: 16.4
             test-destination-os: latest
-            device: "Apple Watch Series 10 (46mm)"
+            device: "Apple Watch Series 10 (42mm)"
 
-          - runs-on: macos-14
+          - runs-on: macos-15
             platform: visionOS
-            xcode: 16.1
-            test-destination-os: latest
+            xcode: 16.4
+            test-destination-os: 2.5
             device: "Apple Vision Pro"
     steps:
       - name: Checkout
@@ -100,17 +100,17 @@ jobs:
               ;;
           esac
   objc-example-test:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set Xcode 15
+        uses: actions/checkout@v4
+      - name: Set Xcode 16
         run: |
-          sudo xcode-select -switch /Applications/Xcode_16.1.app
+          sudo xcode-select -switch /Applications/Xcode_16.4.app
       - name: Objective-C Example Tests (iOS)
         working-directory: Examples/AmplitudeObjCExample
         run: |
           xcodebuild test \
             -scheme AmplitudeObjCExample \
             -sdk iphonesimulator \
-            -destination 'platform=iOS Simulator,name=iPhone 16'
+            -destination 'platform=iOS Simulator,OS=18.5,name=iPhone 16'
diff --git a/Amplitude-Swift.xcodeproj/project.pbxproj b/Amplitude-Swift.xcodeproj/project.pbxproj
diff --git a/Amplitude-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Amplitude-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Amplitude-Swift.xcodeproj/xcshareddata/xcschemes/Amplitude-Swift-Package-DisableUIKit.xcscheme b/Amplitude-Swift.xcodeproj/xcshareddata/xcschemes/Amplitude-Swift-Package-DisableUIKit.xcscheme
@@ -15,23 +15,23 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "amplitude-swift::Amplitude-Swift"
-               BuildableName = "AmplitudeSwift.framework"
-               BlueprintName = "Amplitude-Swift"
+               BlueprintIdentifier = "EAED99F62EE7B47E00A5FC08"
+               BuildableName = "AmplitudeSwiftNoUIKit.framework"
+               BlueprintName = "Amplitude-Swift-NoUIKit"
                ReferencedContainer = "container:Amplitude-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "DebugDisableUIKiit"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "DebugDisableUIKiit"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -42,26 +42,17 @@
       allowLocationSimulation = "YES">
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "ReleaseDisableUIKit"
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "amplitude-swift::Amplitude-Swift"
-            BuildableName = "AmplitudeSwift.framework"
-            BlueprintName = "Amplitude-Swift"
-            ReferencedContainer = "container:Amplitude-Swift.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = "DebugDisableUIKiit">
+      buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "ReleaseDisableUIKit"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/amplitude/analytics-connector-ios.git", from: "1.3.0"),
-        .package(url: "https://github.com/amplitude/AmplitudeCore-Swift.git", from: "1.2.4"),
+        .package(url: "https://github.com/amplitude/AmplitudeCore-Swift.git", from: "1.3.1"),
     ],
     targets: [
         .target(
diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift
@@ -21,7 +21,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/amplitude/analytics-connector-ios.git", from: "1.3.0"),
-        .package(url: "https://github.com/amplitude/AmplitudeCore-Swift.git", from: "1.2.4"),
+        .package(url: "https://github.com/amplitude/AmplitudeCore-Swift.git", from: "1.3.1"),
     ],
     targets: [
         .target(
diff --git a/Sources/Amplitude/Amplitude.swift b/Sources/Amplitude/Amplitude.swift
@@ -1,5 +1,9 @@
-@_spi(Internal)
-@_exported import AmplitudeCore
+#if AMPLITUDE_DISABLE_UIKIT
+@_spi(Internal) @_exported import AmplitudeCoreNoUIKit
+#else
+@_spi(Internal) @_exported import AmplitudeCore
+#endif
+
 import Foundation
 
 public class Amplitude {
@@ -128,7 +132,11 @@ public class Amplitude {
         trackingQueue.suspend()
         self.configuration = configuration
 
+#if AMPLITUDE_DISABLE_UIKIT
+        let serverZone: AmplitudeCoreNoUIKit.ServerZone
+#else
         let serverZone: AmplitudeCore.ServerZone
+#endif
         switch configuration.serverZone {
         case .US:
             serverZone = .US
diff --git a/Sources/Amplitude/Configuration.swift b/Sources/Amplitude/Configuration.swift
@@ -7,8 +7,11 @@
 
 import Foundation
 
-@_spi(Internal)
-import AmplitudeCore
+#if AMPLITUDE_DISABLE_UIKIT
+@_spi(Internal) import AmplitudeCoreNoUIKit
+#else
+@_spi(Internal) import AmplitudeCore
+#endif
 
 public class Configuration {
 
diff --git a/Sources/Amplitude/Events/BaseEvent.swift b/Sources/Amplitude/Events/BaseEvent.swift
@@ -5,7 +5,11 @@
 //  Created by Marvin Liu on 11/3/22.
 //
 
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 import Foundation
 
 open class BaseEvent: EventOptions, AnalyticsEvent, Codable {
diff --git a/Sources/Amplitude/Identity.swift b/Sources/Amplitude/Identity.swift
@@ -5,7 +5,11 @@
 //  Created by Chris Leonavicius on 3/28/25.
 //
 
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 
 public struct Identity: AnalyticsIdentity {
     public var userId: String?
diff --git a/Sources/Amplitude/Mediator.swift b/Sources/Amplitude/Mediator.swift
@@ -5,7 +5,11 @@
 //  Created by Hao Yu on 11/9/22.
 //
 
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 import Foundation
 
 internal class Mediator {
diff --git a/Sources/Amplitude/Sessions.swift b/Sources/Amplitude/Sessions.swift
@@ -1,4 +1,8 @@
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 import Foundation
 
 public class Sessions {
diff --git a/Sources/Amplitude/Storages/PersistentStorage.swift b/Sources/Amplitude/Storages/PersistentStorage.swift
@@ -7,8 +7,11 @@
 
 import Foundation
 
-@_spi(Internal)
-import AmplitudeCore
+#if AMPLITUDE_DISABLE_UIKIT
+@_spi(Internal) import AmplitudeCoreNoUIKit
+#else
+@_spi(Internal) import AmplitudeCore
+#endif
 
 class PersistentStorage: Storage {
     typealias EventBlock = URL
diff --git a/Sources/Amplitude/Timeline.swift b/Sources/Amplitude/Timeline.swift
@@ -5,7 +5,11 @@
 //  Created by Marvin Liu on 10/27/22.
 //
 
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 import Foundation
 
 public class Timeline {
diff --git a/Sources/Amplitude/Types.swift b/Sources/Amplitude/Types.swift
@@ -5,7 +5,11 @@
 //  Created by Marvin Liu on 10/27/22.
 //
 
+#if AMPLITUDE_DISABLE_UIKIT
+import AmplitudeCoreNoUIKit
+#else
 import AmplitudeCore
+#endif
 import Foundation
 
 public struct Plan: Codable {
diff --git a/Sources/Amplitude/Utilities/PersistentStorageResponseHandler.swift b/Sources/Amplitude/Utilities/PersistentStorageResponseHandler.swift
@@ -7,8 +7,11 @@
 
 import Foundation
 
-@_spi(Internal)
-import AmplitudeCore
+#if AMPLITUDE_DISABLE_UIKIT
+@_spi(Internal) import AmplitudeCoreNoUIKit
+#else
+@_spi(Internal) import AmplitudeCore
+#endif
 
 class PersistentStorageResponseHandler: ResponseHandler {
     var configuration: Configuration
diff --git a/Tests/AmplitudeTests/Supports/TestUtilities.swift b/Tests/AmplitudeTests/Supports/TestUtilities.swift
@@ -341,23 +341,16 @@ actor FakeDiagnosticsClient: CoreDiagnostics {
     init() { }
 
     func setTag(name: String, value: String) { }
-    
-    func setTags(_ tags: [String : String]) { }
+
+    func setTags(_ tags: [String: String]) { }
 
     func increment(name: String) { }
 
     func increment(name: String, size: Int) { }
 
     func recordHistogram(name: String, value: Double) { }
 
-    func recordEvent(name: String, properties: [String : any Sendable]?) { }
-
-    func observeIsRunning() -> (stream: AsyncStream<Bool>, id: UUID) { abort() }
-
-    func stopObservingIsRunning(_ id: UUID) { }
-
-    var isRunning: Bool {
-        return false
-    }
+    func recordEvent(name: String, properties: [String: any Sendable]?) { }
 
+    func flush() async {}
 }
diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh
@@ -2,12 +2,12 @@
 
 set -e
 
-SCHEME="Amplitude-Swift-Package"
+CONFIGURATION="Release"
 BUILD_DIR="./.build/artifacts"
 PLATFORMS=("iOS" "iOS Simulator" "macOS" "macOS Cataylst" "watchOS" "watchOS Simulator" "tvOS" "tvOS Simulator" "visionOS" "visionOS Simulator")
 
-build_framework_with_configuration_and_name() {
-    CONFIGURATION=${1}
+build_framework_with_schema_and_name() {
+    SCHEME=${1}
     FRAMEWORK=${2}
     OUTPUT_PATH="${BUILD_DIR}/${FRAMEWORK}.xcframework"
 
@@ -50,5 +50,5 @@ build_framework_with_configuration_and_name() {
 
 rm -rf "$BUILD_DIR"
 mkdir -p "$BUILD_DIR"
-build_framework_with_configuration_and_name "Release" "AmplitudeSwift"
-build_framework_with_configuration_and_name "ReleaseDisableUIKit" "AmplitudeSwiftNoUIKit"
+build_framework_with_schema_and_name "Amplitude-Swift-Package" "AmplitudeSwift"
+build_framework_with_schema_and_name "Amplitude-Swift-Package-DisableUIKit" "AmplitudeSwiftNoUIKit"
