Skip to content

Commit 7e0f4b8

Browse files
AbhijeetMallickAbhijeetMallick
committed
Merge branch 'rename_sdk' of github.com:gojek/clickstream-ios into task/show-timestamp-in-ev-details
# Conflicts: # ClickstreamLib.podspec # ClickstreamLib.xcodeproj/project.pbxproj # Example/Example/src/Contracts/App.pb.swift # Example/Example/src/Contracts/Device.pb.swift # Example/Example/src/Contracts/User.pb.swift # Podfile.lock # Sources/ClickstreamLib/NetworkManager/Infrastructure/Utilities/DispatchSourceTimer+RepeatingTimer.swift
2 parents 8cafb88 + fd98f3a commit 7e0f4b8

File tree

107 files changed

+891
-915
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+891
-915
lines changed

‎Clickstream.podspec renamed to ‎ClickstreamLib.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

99
Pod::Spec.new do |s|
10-
s.name = "Clickstream"
10+
s.name = "ClickstreamLib"
1111
s.version = "2.0.14"
1212
s.summary = "Real time Analytics SDK"
1313
s.description = "Clickstream is an event agnostic, real-time data ingestion analytics SDK"

‎Clickstream.xcodeproj/project.pbxproj renamed to ‎ClickstreamLib.xcodeproj/project.pbxproj

Lines changed: 823 additions & 858 deletions
Large diffs are not rendered by default.

‎Clickstream.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ‎ClickstreamLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎Clickstream.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to ‎ClickstreamLib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

‎Clickstream.xcodeproj/xcshareddata/xcschemes/Clickstream.xcscheme renamed to ‎ClickstreamLib.xcodeproj/xcshareddata/xcschemes/ClickstreamLib.xcscheme

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "68E7BADE244F08C00072549A"
18-
BuildableName = "libClickstream.a"
19-
BlueprintName = "Clickstream"
20-
ReferencedContainer = "container:Clickstream.xcodeproj">
18+
BuildableName = "libClickstreamLib.a"
19+
BlueprintName = "ClickstreamLib"
20+
ReferencedContainer = "container:ClickstreamLib.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -35,7 +35,7 @@
3535
BlueprintIdentifier = "68E7BD1A2456E6F10072549A"
3636
BuildableName = "ClickstreamTests.xctest"
3737
BlueprintName = "ClickstreamTests"
38-
ReferencedContainer = "container:Clickstream.xcodeproj">
38+
ReferencedContainer = "container:ClickstreamLib.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
@@ -61,9 +61,9 @@
6161
<BuildableReference
6262
BuildableIdentifier = "primary"
6363
BlueprintIdentifier = "68E7BADE244F08C00072549A"
64-
BuildableName = "libClickstream.a"
65-
BlueprintName = "Clickstream"
66-
ReferencedContainer = "container:Clickstream.xcodeproj">
64+
BuildableName = "libClickstreamLib.a"
65+
BlueprintName = "ClickstreamLib"
66+
ReferencedContainer = "container:ClickstreamLib.xcodeproj">
6767
</BuildableReference>
6868
</MacroExpansion>
6969
</ProfileAction>

‎Clickstream.xcworkspace/contents.xcworkspacedata renamed to ‎ClickstreamLib.xcworkspace/contents.xcworkspacedata

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Clickstream.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist renamed to ‎ClickstreamLib.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

File renamed without changes.

‎ClickstreamLib.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>PreviewsEnabled</key>
6+
<false/>
7+
</dict>
8+
</plist>

‎ClickstreamTests/Core/ClickStreamDependenciesTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class ClickstreamDependenciesTests: XCTestCase {

‎ClickstreamTests/Core/ClickStreamTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111
import SwiftProtobuf
1212

‎ClickstreamTests/Core/Entities/EventBatchTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111
import SwiftProtobuf
1212

‎ClickstreamTests/Core/Entities/EventTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class EventTests: XCTestCase {

‎ClickstreamTests/Core/Mocks/MockConstants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2023 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212
struct MockConstants {

‎ClickstreamTests/EventProcessorTests/EventProcessorDependenciesTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class EventProcessorDependenciesTests: XCTestCase {

‎ClickstreamTests/EventProcessorTests/EventProcessorTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111
import SwiftProtobuf
1212

‎ClickstreamTests/EventSchedulerTests/AppStateNotifierServiceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class AppStateNotifierServiceTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/Data/Persistence/DatabaseDAOTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2021 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class DatabaseDAOTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/EventBatchProcessorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class EventBatchProcessorTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/EventCreatorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212

‎ClickstreamTests/EventSchedulerTests/EventSchedulerDependenciesTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class EventSchedulerDependenciesTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/EventWarehouserTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class EventWarehouserTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/Mocks/AppStateNotifierMock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212
final class AppStateNotifierMock: AppStateNotifierService {

‎ClickstreamTests/EventSchedulerTests/Mocks/BatchSizeRegulatorMock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2021 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212
final class BatchSizeRegulatorMock: BatchSizeRegulator {

‎ClickstreamTests/EventSchedulerTests/SchedulerServiceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class SchedulerServiceTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/SortedArrayTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class SortedArrayTests: XCTestCase {

‎ClickstreamTests/EventSchedulerTests/Utilities/DispatchQueue+Detection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
// Refered from: https://stackoverflow.com/a/60314121
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212
extension SerialQueue {

‎ClickstreamTests/NetworkManagerTests/Core/NetworkManagerDependenciesTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class NetworkManagerDependenciesTests: XCTestCase {

‎ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkBuilderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class NetworkBuilderTests: XCTestCase {

‎ClickstreamTests/NetworkManagerTests/Infrastructure/NetworkServiceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class NetworkServiceTests: XCTestCase {

‎ClickstreamTests/NetworkManagerTests/Infrastructure/RetryMechanismTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2021 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class RetryMechanismTests: XCTestCase {

‎ClickstreamTests/NetworkManagerTests/Mocks/NetworkReachabilityMock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212

‎ClickstreamTests/NetworkManagerTests/Mocks/SocketHandlerMock.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import Foundation
1111

1212
enum SocketConnectionState {

‎ClickstreamTests/NetworkManagerTests/Models/EventRequestTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111
import SwiftProtobuf
1212

‎ClickstreamTests/NetworkManagerTests/Utilities/DeviceStatusNotifierTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class DeviceStatusNotifierTests: XCTestCase {

‎ClickstreamTests/NetworkManagerTests/Utilities/KeepAliveServiceTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2020 Gojek. All rights reserved.
77
//
88

9-
@testable import Clickstream
9+
@testable import ClickstreamLib
1010
import XCTest
1111

1212
class KeepAliveServiceTests: XCTestCase {
@@ -39,7 +39,6 @@ class KeepAliveServiceTests: XCTestCase {
3939
//when
4040
sut.start {
4141
callbackCount += 1
42-
print(callbackCount)
4342
}
4443

4544
mockQueue.asyncAfter(deadline: .now() + 4.5) {

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@
441441
"\"CoreTelephony\"",
442442
"-framework",
443443
"\"SystemConfiguration\"",
444-
"-l\"Clickstream\"",
444+
"-l\"ClickstreamLib\"",
445445
);
446446
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\"";
447447
PRODUCT_BUNDLE_IDENTIFIER = com.clickstream.example;
@@ -473,7 +473,7 @@
473473
"\"CoreTelephony\"",
474474
"-framework",
475475
"\"SystemConfiguration\"",
476-
"-l\"Clickstream\"",
476+
"-l\"ClickstreamLib\"",
477477
);
478478
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\"";
479479
PRODUCT_BUNDLE_IDENTIFIER = com.clickstream.example;

‎Example/Example/src/AnalyticsManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import Clickstream
10+
import ClickstreamLib
1111
import SwiftProtobuf
1212

1313
class AnalyticsManager {

‎Example/Example/src/Contracts/EventVisualizer+ClickStreamContracts.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010
import SwiftProtobuf
1111

1212
#if EVENT_VISUALIZER_ENABLED
13-
import Clickstream
13+
import ClickstreamLib
1414

1515
extension User: CollectionMapper { }
1616
extension Device: CollectionMapper { }

‎Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ source 'https://github.com/CocoaPods/Specs.git'
55
platform :ios, '11.0'
66
use_modular_headers!
77

8-
project 'Clickstream.xcodeproj'
9-
workspace 'Clickstream.xcworkspace'
8+
project 'ClickstreamLib.xcodeproj'
9+
workspace 'ClickstreamLib.xcworkspace'
1010

1111
def clickstream_pods
1212
pod 'SwiftProtobuf', '~> 1.10'
1313
pod 'ReachabilitySwift', '~> 5.0'
1414
pod 'GRDB.swift', '~> 6.7'
1515
end
1616

17-
target 'Clickstream' do
17+
target 'ClickstreamLib' do
1818
clickstream_pods
1919
end
2020

0 commit comments

Comments
 (0)