Merge branch 'main' of github.com:gojek/clickstream-ios into rename_sdk

# Conflicts: # ClickstreamLib.podspec # ClickstreamLib.xcodeproj/project.pbxproj # Podfile.lock # Sources/ClickstreamLib/NetworkManager/Infrastructure/Utilities/DispatchSourceTimer+RepeatingTimer.swift
gojek · Apr 8, 2024 · fd85313 · fd85313
2 parents 257344f + 5085253
commit fd85313
Show file tree

Hide file tree

Showing 109 changed files with 104 additions and 90 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ClickstreamLib.podspec → Clickstream.podspec b/ClickstreamLib.podspec → Clickstream.podspec
@@ -7,7 +7,7 @@
 #
 
 Pod::Spec.new do |s|
-  s.name             = "ClickstreamLib"
+  s.name             = "Clickstream"
   s.version          = "2.0.20"
   s.summary          = "Real time Analytics SDK"
   s.description      = "Clickstream is an event agnostic, real-time data ingestion analytics SDK"

diff --git a/ClickstreamLib.xcodeproj/project.pbxproj → Clickstream.xcodeproj/project.pbxproj b/ClickstreamLib.xcodeproj/project.pbxproj → Clickstream.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...reddata/xcschemes/ClickstreamLib.xcscheme → ...shareddata/xcschemes/Clickstream.xcscheme b/...reddata/xcschemes/ClickstreamLib.xcscheme → ...shareddata/xcschemes/Clickstream.xcscheme
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
-   version = "1.3">
+   LastUpgradeVersion = "1530"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,9 +16,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "68E7BADE244F08C00072549A"
-               BuildableName = "libClickstreamLib.a"
-               BlueprintName = "ClickstreamLib"
-               ReferencedContainer = "container:ClickstreamLib.xcodeproj">
+               BuildableName = "libClickstream.a"
+               BlueprintName = "Clickstream"
+               ReferencedContainer = "container:Clickstream.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,7 +27,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -35,7 +37,7 @@
                BlueprintIdentifier = "68E7BD1A2456E6F10072549A"
                BuildableName = "ClickstreamTests.xctest"
                BlueprintName = "ClickstreamTests"
-               ReferencedContainer = "container:ClickstreamLib.xcodeproj">
+               ReferencedContainer = "container:Clickstream.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -61,9 +63,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "68E7BADE244F08C00072549A"
-            BuildableName = "libClickstreamLib.a"
-            BlueprintName = "ClickstreamLib"
-            ReferencedContainer = "container:ClickstreamLib.xcodeproj">
+            BuildableName = "libClickstream.a"
+            BlueprintName = "Clickstream"
+            ReferencedContainer = "container:Clickstream.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...mLib.xcworkspace/contents.xcworkspacedata → ...ream.xcworkspace/contents.xcworkspacedata b/...mLib.xcworkspace/contents.xcworkspacedata → ...ream.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ClickstreamTests/Core/ClickStreamDependenciesTests.swift b/ClickstreamTests/Core/ClickStreamDependenciesTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class ClickstreamDependenciesTests: XCTestCase {

diff --git a/ClickstreamTests/Core/ClickStreamTests.swift b/ClickstreamTests/Core/ClickStreamTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 import SwiftProtobuf
 

diff --git a/ClickstreamTests/Core/Entities/EventBatchTests.swift b/ClickstreamTests/Core/Entities/EventBatchTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 import SwiftProtobuf
 

diff --git a/ClickstreamTests/Core/Entities/EventTests.swift b/ClickstreamTests/Core/Entities/EventTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class EventTests: XCTestCase {

diff --git a/ClickstreamTests/Core/Mocks/MockConstants.swift b/ClickstreamTests/Core/Mocks/MockConstants.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2023 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 struct MockConstants {

diff --git a/ClickstreamTests/EventProcessorTests/EventProcessorDependenciesTests.swift b/ClickstreamTests/EventProcessorTests/EventProcessorDependenciesTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class EventProcessorDependenciesTests: XCTestCase {

diff --git a/ClickstreamTests/EventProcessorTests/EventProcessorTest.swift b/ClickstreamTests/EventProcessorTests/EventProcessorTest.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 import SwiftProtobuf
 

diff --git a/ClickstreamTests/EventSchedulerTests/AppStateNotifierServiceTests.swift b/ClickstreamTests/EventSchedulerTests/AppStateNotifierServiceTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class AppStateNotifierServiceTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/Data/Persistence/DatabaseDAOTests.swift b/ClickstreamTests/EventSchedulerTests/Data/Persistence/DatabaseDAOTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class DatabaseDAOTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/EventBatchProcessorTests.swift b/ClickstreamTests/EventSchedulerTests/EventBatchProcessorTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class EventBatchProcessorTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/EventCreatorTests.swift b/ClickstreamTests/EventSchedulerTests/EventCreatorTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 

diff --git a/ClickstreamTests/EventSchedulerTests/EventSchedulerDependenciesTests.swift b/ClickstreamTests/EventSchedulerTests/EventSchedulerDependenciesTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class EventSchedulerDependenciesTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/EventWarehouserTests.swift b/ClickstreamTests/EventSchedulerTests/EventWarehouserTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class EventWarehouserTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/Mocks/AppStateNotifierMock.swift b/ClickstreamTests/EventSchedulerTests/Mocks/AppStateNotifierMock.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 final class AppStateNotifierMock: AppStateNotifierService {

diff --git a/ClickstreamTests/EventSchedulerTests/Mocks/BatchSizeRegulatorMock.swift b/ClickstreamTests/EventSchedulerTests/Mocks/BatchSizeRegulatorMock.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 final class BatchSizeRegulatorMock: BatchSizeRegulator {

diff --git a/ClickstreamTests/EventSchedulerTests/SchedulerServiceTests.swift b/ClickstreamTests/EventSchedulerTests/SchedulerServiceTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class SchedulerServiceTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/SortedArrayTests.swift b/ClickstreamTests/EventSchedulerTests/SortedArrayTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class SortedArrayTests: XCTestCase {

diff --git a/ClickstreamTests/EventSchedulerTests/Utilities/DispatchQueue+Detection.swift b/ClickstreamTests/EventSchedulerTests/Utilities/DispatchQueue+Detection.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //  Refered from: https://stackoverflow.com/a/60314121
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 extension SerialQueue {

diff --git a/ClickstreamTests/NetworkManagerTests/Core/NetworkManagerDependenciesTests.swift b/ClickstreamTests/NetworkManagerTests/Core/NetworkManagerDependenciesTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class NetworkManagerDependenciesTests: XCTestCase {

diff --git a/ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkBuilderTests.swift b/ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkBuilderTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class NetworkBuilderTests: XCTestCase {

diff --git a/ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkServiceTests.swift b/ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkServiceTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class NetworkServiceTests: XCTestCase {

diff --git a/ClickstreamTests/NetworkManagerTests/Infrastructure/RetryMechanismTests.swift b/ClickstreamTests/NetworkManagerTests/Infrastructure/RetryMechanismTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class RetryMechanismTests: XCTestCase {

diff --git a/ClickstreamTests/NetworkManagerTests/Mocks/NetworkReachabilityMock.swift b/ClickstreamTests/NetworkManagerTests/Mocks/NetworkReachabilityMock.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 

diff --git a/ClickstreamTests/NetworkManagerTests/Mocks/SocketHandlerMock.swift b/ClickstreamTests/NetworkManagerTests/Mocks/SocketHandlerMock.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import Foundation
 
 enum SocketConnectionState {

diff --git a/ClickstreamTests/NetworkManagerTests/Models/EventRequestTests.swift b/ClickstreamTests/NetworkManagerTests/Models/EventRequestTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 import SwiftProtobuf
 

diff --git a/ClickstreamTests/NetworkManagerTests/Utilities/DeviceStatusNotifierTests.swift b/ClickstreamTests/NetworkManagerTests/Utilities/DeviceStatusNotifierTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class DeviceStatusNotifierTests: XCTestCase {

diff --git a/ClickstreamTests/NetworkManagerTests/Utilities/KeepAliveServiceTests.swift b/ClickstreamTests/NetworkManagerTests/Utilities/KeepAliveServiceTests.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Gojek. All rights reserved.
 //
 
-@testable import ClickstreamLib
+@testable import Clickstream
 import XCTest
 
 class KeepAliveServiceTests: XCTestCase {

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -441,7 +441,7 @@
 					"\"CoreTelephony\"",
 					"-framework",
 					"\"SystemConfiguration\"",
-					"-l\"ClickstreamLib\"",
+					"-l\"Clickstream\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/GRDB.swift/GRDB.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf/SwiftProtobuf.modulemap\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.clickstream.example;
@@ -473,7 +473,7 @@
 					"\"CoreTelephony\"",
 					"-framework",
 					"\"SystemConfiguration\"",
-					"-l\"ClickstreamLib\"",
+					"-l\"Clickstream\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/GRDB.swift/GRDB.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf/SwiftProtobuf.modulemap\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.clickstream.example;

diff --git a/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...xcshareddata/WorkspaceSettings.xcsettings → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...xcshareddata/WorkspaceSettings.xcsettings → ...ace/xcshareddata/IDEWorkspaceChecks.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>PreviewsEnabled</key>
-	<false/>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Example/Example/src/AnalyticsManager.swift b/Example/Example/src/AnalyticsManager.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import ClickstreamLib
+import Clickstream
 import SwiftProtobuf
 
 class AnalyticsManager {

diff --git a/Example/Example/src/Contracts/EventVisualizer+ClickStreamContracts.swift b/Example/Example/src/Contracts/EventVisualizer+ClickStreamContracts.swift
@@ -10,7 +10,7 @@ import Foundation
 import SwiftProtobuf
 
 #if EVENT_VISUALIZER_ENABLED
-import ClickstreamLib
+import Clickstream
 
 extension User: CollectionMapper { }
 extension Device: CollectionMapper { }

diff --git a/Podfile b/Podfile
@@ -5,16 +5,16 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '11.0'
  use_modular_headers!
 
-project 'ClickstreamLib.xcodeproj'
-workspace 'ClickstreamLib.xcworkspace'
+project 'Clickstream.xcodeproj'
+workspace 'Clickstream.xcworkspace'
 
 def clickstream_pods
   pod 'SwiftProtobuf', '~> 1.10'
   pod 'ReachabilitySwift', '>= 5.0.0'
   pod 'GRDB.swift', '~> 6.7'
 end
 
-target 'ClickstreamLib' do
+target 'Clickstream' do
    clickstream_pods
 end