From 306635da628e07ca8e3747b03cc62e78b796de5a Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 5 Apr 2024 14:48:27 +0200
Subject: [PATCH] revert: adding `internal` package

This change was making PR review more difficult, better to do in a separate PR
---
 .../src/main/java/com/example/InternalDebugOnlyData.java    | 2 +-
 example/src/main/java/com/example/MainActivity.java         | 2 +-
 .../java/com/parsely/parselyandroid/FunctionalTests.kt      | 2 --
 .../{internal => }/AdvertisementIdProvider.kt               | 4 ++--
 .../java/com/parsely/parselyandroid/{internal => }/Clock.kt | 2 +-
 .../{internal => }/ConnectivityStatusProvider.kt            | 2 +-
 .../parselyandroid/{internal => }/DeviceInfoRepository.kt   | 4 ++--
 .../parselyandroid/{internal => }/EngagementManager.kt      | 5 ++---
 .../parsely/parselyandroid/{internal => }/EventQueuer.kt    | 2 +-
 .../parsely/parselyandroid/{internal => }/EventsBuilder.kt  | 6 ++----
 .../parsely/parselyandroid/{internal => }/FlushManager.kt   | 2 +-
 .../com/parsely/parselyandroid/{internal => }/FlushQueue.kt | 6 +++---
 .../{internal => }/HeartbeatIntervalCalculator.kt           | 2 +-
 .../parsely/parselyandroid/{internal => }/InMemoryBuffer.kt | 4 ++--
 .../parsely/parselyandroid/{internal => }/JsonSerializer.kt | 2 +-
 .../parselyandroid/{internal => }/LocalStorageRepository.kt | 4 ++--
 .../com/parsely/parselyandroid/{internal => }/Logging.kt    | 2 +-
 .../parselyandroid/{internal => }/ParselyAPIConnection.kt   | 2 +-
 .../parselyandroid/{internal => }/ParselyCoroutineScope.kt  | 2 +-
 .../main/java/com/parsely/parselyandroid/ParselyTracker.kt  | 1 -
 .../parselyandroid/{internal => }/ParselyTrackerInternal.kt | 6 +-----
 .../parselyandroid/AndroidDeviceInfoRepositoryTest.kt       | 1 -
 .../com/parsely/parselyandroid/AndroidIdProviderTest.kt     | 1 -
 .../com/parsely/parselyandroid/EngagementManagerTest.kt     | 4 ----
 .../java/com/parsely/parselyandroid/EventsBuilderTest.kt    | 3 ---
 .../java/com/parsely/parselyandroid/FlushManagerTest.kt     | 1 -
 .../test/java/com/parsely/parselyandroid/FlushQueueTest.kt  | 5 -----
 .../parselyandroid/HeartbeatIntervalCalculatorTest.kt       | 4 +---
 .../java/com/parsely/parselyandroid/InMemoryBufferTest.kt   | 2 --
 .../parsely/parselyandroid/LocalStorageRepositoryTest.kt    | 1 -
 .../com/parsely/parselyandroid/ParselyAPIConnectionTest.kt  | 1 -
 31 files changed, 28 insertions(+), 59 deletions(-)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/AdvertisementIdProvider.kt (93%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/Clock.kt (86%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/ConnectivityStatusProvider.kt (93%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/DeviceInfoRepository.kt (92%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/EngagementManager.kt (94%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/EventQueuer.kt (65%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/EventsBuilder.kt (91%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/FlushManager.kt (96%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/FlushQueue.kt (91%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/HeartbeatIntervalCalculator.kt (94%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/InMemoryBuffer.kt (92%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/JsonSerializer.kt (95%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/LocalStorageRepository.kt (96%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/Logging.kt (88%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/ParselyAPIConnection.kt (97%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/ParselyCoroutineScope.kt (86%)
 rename parsely/src/main/java/com/parsely/parselyandroid/{internal => }/ParselyTrackerInternal.kt (96%)

diff --git a/example/src/main/java/com/example/InternalDebugOnlyData.java b/example/src/main/java/com/example/InternalDebugOnlyData.java
index 00ad0591..59a0f2f3 100644
--- a/example/src/main/java/com/example/InternalDebugOnlyData.java
+++ b/example/src/main/java/com/example/InternalDebugOnlyData.java
@@ -1,6 +1,6 @@
 package com.example;
 
-import com.parsely.parselyandroid.internal.ParselyTrackerInternal;
+import com.parsely.parselyandroid.ParselyTrackerInternal;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/example/src/main/java/com/example/MainActivity.java b/example/src/main/java/com/example/MainActivity.java
index 0bd5f6da..10003620 100644
--- a/example/src/main/java/com/example/MainActivity.java
+++ b/example/src/main/java/com/example/MainActivity.java
@@ -11,7 +11,7 @@
 
 import com.parsely.parselyandroid.ParselyTracker;
 import com.parsely.parselyandroid.SiteIdSource;
-import com.parsely.parselyandroid.internal.ParselyTrackerInternal;
+import com.parsely.parselyandroid.ParselyTrackerInternal;
 import com.parsely.parselyandroid.ParselyVideoMetadata;
 
 import java.util.ArrayList;
diff --git a/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt b/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt
index 15e11a83..9dfa2225 100644
--- a/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt
+++ b/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt
@@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.parsely.parselyandroid.internal.ParselyTrackerInternal
 import java.io.File
 import java.io.FileInputStream
 import java.io.ObjectInputStream
@@ -21,7 +20,6 @@ import kotlin.io.path.Path
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.parse
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/AdvertisementIdProvider.kt b/parsely/src/main/java/com/parsely/parselyandroid/AdvertisementIdProvider.kt
similarity index 93%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/AdvertisementIdProvider.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/AdvertisementIdProvider.kt
index 14227241..87e93a84 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/AdvertisementIdProvider.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/AdvertisementIdProvider.kt
@@ -1,9 +1,9 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import android.content.Context
 import android.provider.Settings
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
-import com.parsely.parselyandroid.internal.Logging.log
+import com.parsely.parselyandroid.Logging.log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/Clock.kt b/parsely/src/main/java/com/parsely/parselyandroid/Clock.kt
similarity index 86%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/Clock.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/Clock.kt
index 3654d4e5..3d64e171 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/Clock.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/Clock.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import java.util.Calendar
 import java.util.TimeZone
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/ConnectivityStatusProvider.kt b/parsely/src/main/java/com/parsely/parselyandroid/ConnectivityStatusProvider.kt
similarity index 93%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/ConnectivityStatusProvider.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/ConnectivityStatusProvider.kt
index e8e0c5f5..4ef76e24 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/ConnectivityStatusProvider.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/ConnectivityStatusProvider.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import android.content.Context
 import android.net.ConnectivityManager
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/DeviceInfoRepository.kt b/parsely/src/main/java/com/parsely/parselyandroid/DeviceInfoRepository.kt
similarity index 92%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/DeviceInfoRepository.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/DeviceInfoRepository.kt
index dbb86eec..61abdc4f 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/DeviceInfoRepository.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/DeviceInfoRepository.kt
@@ -1,7 +1,7 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import android.os.Build
-import com.parsely.parselyandroid.internal.Logging.log
+import com.parsely.parselyandroid.Logging.log
 
 internal interface DeviceInfoRepository{
     fun collectDeviceInfo(): Map<String, String>
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/EngagementManager.kt b/parsely/src/main/java/com/parsely/parselyandroid/EngagementManager.kt
similarity index 94%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/EngagementManager.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/EngagementManager.kt
index 9269d3ad..4bb39ac3 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/EngagementManager.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/EngagementManager.kt
@@ -1,7 +1,6 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.Logging.log
-import com.parsely.parselyandroid.ParselyVideoMetadata
+import com.parsely.parselyandroid.Logging.log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/EventQueuer.kt b/parsely/src/main/java/com/parsely/parselyandroid/EventQueuer.kt
similarity index 65%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/EventQueuer.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/EventQueuer.kt
index 02c68c48..37b6ee63 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/EventQueuer.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/EventQueuer.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 internal interface EventQueuer {
     fun enqueueEvent(event: Map<String, Any>)
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/EventsBuilder.kt b/parsely/src/main/java/com/parsely/parselyandroid/EventsBuilder.kt
similarity index 91%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/EventsBuilder.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/EventsBuilder.kt
index 977a6d40..7553f08a 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/EventsBuilder.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/EventsBuilder.kt
@@ -1,8 +1,6 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.Logging.log
-import com.parsely.parselyandroid.ParselyMetadata
-import com.parsely.parselyandroid.SiteIdSource
+import com.parsely.parselyandroid.Logging.log
 
 internal class EventsBuilder(
     private val deviceInfoRepository: DeviceInfoRepository,
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/FlushManager.kt b/parsely/src/main/java/com/parsely/parselyandroid/FlushManager.kt
similarity index 96%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/FlushManager.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/FlushManager.kt
index f633f239..5026c8d8 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/FlushManager.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/FlushManager.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/FlushQueue.kt b/parsely/src/main/java/com/parsely/parselyandroid/FlushQueue.kt
similarity index 91%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/FlushQueue.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/FlushQueue.kt
index 724c349b..561e7c19 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/FlushQueue.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/FlushQueue.kt
@@ -1,7 +1,7 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.JsonSerializer.toParselyEventsPayload
-import com.parsely.parselyandroid.internal.Logging.log
+import com.parsely.parselyandroid.JsonSerializer.toParselyEventsPayload
+import com.parsely.parselyandroid.Logging.log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/HeartbeatIntervalCalculator.kt b/parsely/src/main/java/com/parsely/parselyandroid/HeartbeatIntervalCalculator.kt
similarity index 94%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/HeartbeatIntervalCalculator.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/HeartbeatIntervalCalculator.kt
index 12624b5b..d50223ff 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/HeartbeatIntervalCalculator.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/HeartbeatIntervalCalculator.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/InMemoryBuffer.kt b/parsely/src/main/java/com/parsely/parselyandroid/InMemoryBuffer.kt
similarity index 92%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/InMemoryBuffer.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/InMemoryBuffer.kt
index 8b49f32c..63f6e70a 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/InMemoryBuffer.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/InMemoryBuffer.kt
@@ -1,6 +1,6 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.Logging.log
+import com.parsely.parselyandroid.Logging.log
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/JsonSerializer.kt b/parsely/src/main/java/com/parsely/parselyandroid/JsonSerializer.kt
similarity index 95%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/JsonSerializer.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/JsonSerializer.kt
index 50efb81e..dde232ce 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/JsonSerializer.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/JsonSerializer.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import java.io.IOException
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/LocalStorageRepository.kt b/parsely/src/main/java/com/parsely/parselyandroid/LocalStorageRepository.kt
similarity index 96%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/LocalStorageRepository.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/LocalStorageRepository.kt
index b7051228..f8dc30fe 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/LocalStorageRepository.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/LocalStorageRepository.kt
@@ -1,7 +1,7 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import android.content.Context
-import com.parsely.parselyandroid.internal.Logging.log
+import com.parsely.parselyandroid.Logging.log
 import java.io.EOFException
 import java.io.FileNotFoundException
 import java.io.ObjectInputStream
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/Logging.kt b/parsely/src/main/java/com/parsely/parselyandroid/Logging.kt
similarity index 88%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/Logging.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/Logging.kt
index e2ee3f84..cdee406a 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/Logging.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/Logging.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import java.util.Formatter
 
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyAPIConnection.kt b/parsely/src/main/java/com/parsely/parselyandroid/ParselyAPIConnection.kt
similarity index 97%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyAPIConnection.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/ParselyAPIConnection.kt
index c4fec063..c1c1e422 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyAPIConnection.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/ParselyAPIConnection.kt
@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import java.net.HttpURLConnection
 import java.net.URL
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyCoroutineScope.kt b/parsely/src/main/java/com/parsely/parselyandroid/ParselyCoroutineScope.kt
similarity index 86%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyCoroutineScope.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/ParselyCoroutineScope.kt
index 938489d6..1c7be0fe 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyCoroutineScope.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/ParselyCoroutineScope.kt
@@ -1,4 +1,4 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt b/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt
index d9393e49..6bb8b41e 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt
@@ -16,7 +16,6 @@
 package com.parsely.parselyandroid
 
 import android.content.Context
-import com.parsely.parselyandroid.internal.ParselyTrackerInternal
 import org.jetbrains.annotations.TestOnly
 
 /**
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyTrackerInternal.kt b/parsely/src/main/java/com/parsely/parselyandroid/ParselyTrackerInternal.kt
similarity index 96%
rename from parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyTrackerInternal.kt
rename to parsely/src/main/java/com/parsely/parselyandroid/ParselyTrackerInternal.kt
index aca85eb4..66333c86 100644
--- a/parsely/src/main/java/com/parsely/parselyandroid/internal/ParselyTrackerInternal.kt
+++ b/parsely/src/main/java/com/parsely/parselyandroid/ParselyTrackerInternal.kt
@@ -1,13 +1,9 @@
-package com.parsely.parselyandroid.internal
+package com.parsely.parselyandroid
 
 import android.content.Context
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.ProcessLifecycleOwner
-import com.parsely.parselyandroid.ParselyMetadata
-import com.parsely.parselyandroid.ParselyTracker
-import com.parsely.parselyandroid.ParselyVideoMetadata
-import com.parsely.parselyandroid.SiteIdSource
 import java.util.UUID
 
 internal class ParselyTrackerInternal internal constructor(
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/AndroidDeviceInfoRepositoryTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/AndroidDeviceInfoRepositoryTest.kt
index e1f3f345..08ef47b8 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/AndroidDeviceInfoRepositoryTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/AndroidDeviceInfoRepositoryTest.kt
@@ -1,6 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.AndroidDeviceInfoRepository
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/AndroidIdProviderTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/AndroidIdProviderTest.kt
index 49e11288..eaf24427 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/AndroidIdProviderTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/AndroidIdProviderTest.kt
@@ -3,7 +3,6 @@ package com.parsely.parselyandroid
 import android.app.Application
 import android.provider.Settings
 import androidx.test.core.app.ApplicationProvider
-import com.parsely.parselyandroid.internal.AndroidIdProvider
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/EngagementManagerTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/EngagementManagerTest.kt
index 7612d4a3..0848b3c6 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/EngagementManagerTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/EngagementManagerTest.kt
@@ -1,9 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.Clock
-import com.parsely.parselyandroid.internal.EngagementManager
-import com.parsely.parselyandroid.internal.EventQueuer
-import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt
index 34172215..cec50c7c 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt
@@ -1,8 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.Clock
-import com.parsely.parselyandroid.internal.DeviceInfoRepository
-import com.parsely.parselyandroid.internal.EventsBuilder
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import org.assertj.core.api.Assertions.assertThat
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/FlushManagerTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/FlushManagerTest.kt
index efdb57a5..02842a2c 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/FlushManagerTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/FlushManagerTest.kt
@@ -1,6 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.ParselyFlushManager
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceTimeBy
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/FlushQueueTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/FlushQueueTest.kt
index cda6dce4..0dea4b1a 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/FlushQueueTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/FlushQueueTest.kt
@@ -1,10 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.ConnectivityStatusProvider
-import com.parsely.parselyandroid.internal.FlushManager
-import com.parsely.parselyandroid.internal.FlushQueue
-import com.parsely.parselyandroid.internal.QueueRepository
-import com.parsely.parselyandroid.internal.RestClient
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/HeartbeatIntervalCalculatorTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/HeartbeatIntervalCalculatorTest.kt
index 8d4bc584..62e90040 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/HeartbeatIntervalCalculatorTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/HeartbeatIntervalCalculatorTest.kt
@@ -1,8 +1,6 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
-import com.parsely.parselyandroid.internal.Clock
-import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator
+import com.parsely.parselyandroid.HeartbeatIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import org.assertj.core.api.Assertions.assertThat
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/InMemoryBufferTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/InMemoryBufferTest.kt
index 7335a185..e4f354ff 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/InMemoryBufferTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/InMemoryBufferTest.kt
@@ -1,7 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.InMemoryBuffer
-import com.parsely.parselyandroid.internal.QueueRepository
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.cancel
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/LocalStorageRepositoryTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/LocalStorageRepositoryTest.kt
index e6fbc414..47a60057 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/LocalStorageRepositoryTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/LocalStorageRepositoryTest.kt
@@ -2,7 +2,6 @@ package com.parsely.parselyandroid
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import com.parsely.parselyandroid.internal.LocalStorageRepository
 import java.io.File
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
diff --git a/parsely/src/test/java/com/parsely/parselyandroid/ParselyAPIConnectionTest.kt b/parsely/src/test/java/com/parsely/parselyandroid/ParselyAPIConnectionTest.kt
index 94004c53..497e5d5c 100644
--- a/parsely/src/test/java/com/parsely/parselyandroid/ParselyAPIConnectionTest.kt
+++ b/parsely/src/test/java/com/parsely/parselyandroid/ParselyAPIConnectionTest.kt
@@ -1,6 +1,5 @@
 package com.parsely.parselyandroid
 
-import com.parsely.parselyandroid.internal.ParselyAPIConnection
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest