From 12762274bfacbb636231fbd1d5b03e8b65e0848f Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 10 Sep 2020 17:59:47 -0400 Subject: [PATCH] ref: sentry-core to sentry --- sentry-android-core/build.gradle.kts | 2 +- sentry-android-core/proguard-rules.pro | 2 +- .../io/sentry/android/core/ANRWatchDog.java | 4 +-- .../core/ActivityBreadcrumbsIntegration.java | 12 +++---- .../io/sentry/android/core/AndroidLogger.java | 4 +-- .../core/AndroidOptionsInitializer.java | 16 ++++----- .../android/core/AndroidTransportGate.java | 4 +-- .../sentry/android/core/AnrIntegration.java | 16 ++++----- .../AppComponentsBreadcrumbsIntegration.java | 14 ++++---- .../android/core/AppLifecycleIntegration.java | 10 +++--- .../core/ApplicationNotResponding.java | 2 +- .../io/sentry/android/core/ContextUtils.java | 4 +-- .../core/DefaultAndroidEventProcessor.java | 28 +++++++-------- .../android/core/EnvelopeFileObserver.java | 20 +++++------ .../core/EnvelopeFileObserverIntegration.java | 14 ++++---- .../sentry/android/core/LifecycleWatcher.java | 10 +++--- .../android/core/ManifestMetadataReader.java | 6 ++-- .../sentry/android/core/NdkIntegration.java | 10 +++--- .../PhoneStateBreadcrumbsIntegration.java | 12 +++---- .../io/sentry/android/core/SentryAndroid.java | 8 ++--- .../android/core/SentryAndroidOptions.java | 4 +-- .../android/core/SentryInitProvider.java | 4 +-- .../SystemEventsBreadcrumbsIntegration.java | 16 ++++----- .../TempSensorBreadcrumbsIntegration.java | 12 +++---- .../core/util/ConnectivityChecker.java | 4 +-- .../android/core/util/DeviceOrientations.java | 2 +- .../android/core/util/MainThreadChecker.java | 2 +- .../sentry/android/core/util/Permissions.java | 2 +- .../sentry/android/core/util/RootChecker.java | 6 ++-- .../ActivityBreadcrumbsIntegrationTest.kt | 6 ++-- .../core/AndroidOptionsInitializerTest.kt | 10 +++--- .../sentry/android/core/AnrIntegrationTest.kt | 2 +- ...AppComponentsBreadcrumbsIntegrationTest.kt | 6 ++-- .../core/AppLifecycleIntegrationTest.kt | 2 +- .../io/sentry/android/core/CachedEvent.kt | 2 +- .../core/DefaultAndroidEventProcessorTest.kt | 14 ++++---- .../EnvelopeFileObserverIntegrationTest.kt | 6 ++-- .../android/core/EnvelopeFileObserverTest.kt | 8 ++--- .../android/core/LifecycleWatcherTest.kt | 8 ++--- .../core/ManifestMetadataReaderTest.kt | 4 +-- .../sentry/android/core/NdkIntegrationTest.kt | 6 ++-- .../PhoneStateBreadcrumbsIntegrationTest.kt | 6 ++-- .../android/core/SentryAndroidOptionsTest.kt | 2 +- .../sentry/android/core/SentryAndroidTest.kt | 6 ++-- .../android/core/SentryInitProviderTest.kt | 6 ++-- .../java/io/sentry/android/core/SentryNdk.kt | 2 +- .../SystemEventsBreadcrumbsIntegrationTest.kt | 6 ++-- .../TempSensorBreadcrumbsIntegrationTest.kt | 6 ++-- .../core/util/DeviceOrientationsTest.kt | 2 +- .../core/util/MainThreadCheckerTest.kt | 2 +- .../android/core/util/RootCheckerTest.kt | 2 +- sentry-android-ndk/build.gradle.kts | 2 +- .../java/io/sentry/android/ndk/SentryNdk.java | 2 +- .../io/sentry/android/ndk/SentryNdkUtil.java | 2 +- .../sentry/android/ndk/SentryNdkUtilTest.kt | 2 +- sentry-android-timber/build.gradle.kts | 2 +- .../android/timber/SentryTimberIntegration.kt | 12 +++---- .../sentry/android/timber/SentryTimberTree.kt | 10 +++--- .../timber/SentryTimberIntegrationTest.kt | 8 ++--- .../android/timber/SentryTimberTreeTest.kt | 8 ++--- .../java/io/sentry/core/SentryEventKtx.kt | 2 +- .../test/java/io/sentry/core/CachedEvent.kt | 5 --- sentry-log4j2/build.gradle.kts | 2 +- .../java/io/sentry/log4j2/SentryAppender.java | 24 ++++++------- .../io/sentry/log4j2/SentryAppenderTest.kt | 6 ++-- sentry-logback/build.gradle.kts | 2 +- .../io/sentry/logback/SentryAppender.java | 20 +++++------ .../io/sentry/logback/SentryAppenderTest.kt | 8 ++--- .../java/io/sentry/sample/MainActivity.java | 4 +-- .../sentry-samples-console/build.gradle.kts | 2 +- .../java/io/sentry/samples/console/Main.java | 14 ++++---- .../spring/boot/CustomEventProcessor.java | 6 ++-- sentry-spring-boot-starter/build.gradle.kts | 2 +- .../spring/boot/SentryAutoConfiguration.java | 18 +++++----- .../sentry/spring/boot/SentryProperties.java | 2 +- .../boot/SentryAutoConfigurationTest.kt | 20 +++++------ .../boot/SentrySpringIntegrationTest.kt | 4 +-- sentry-spring/build.gradle.kts | 2 +- .../java/io/sentry/spring/EnableSentry.java | 4 +-- .../HttpServletRequestSentryUserProvider.java | 6 ++-- .../spring/SentryExceptionResolver.java | 12 +++---- .../io/sentry/spring/SentryHubRegistrar.java | 6 ++-- .../spring/SentryInitBeanPostProcessor.java | 4 +-- .../io/sentry/spring/SentryRequestFilter.java | 10 +++--- ...tryRequestHttpServletRequestProcessor.java | 10 +++--- .../io/sentry/spring/SentryUserProvider.java | 4 +-- .../SentryUserProviderEventProcessor.java | 8 ++--- .../sentry/spring/SentryWebConfiguration.java | 4 +-- .../io/sentry/spring/EnableSentryTest.kt | 4 +-- ...ttpServletRequestSentryUserProviderTest.kt | 2 +- ...yRequestHttpServletRequestProcessorTest.kt | 4 +-- .../spring/SentrySpringIntegrationTest.kt | 4 +-- ...erProviderEventProcessorIntegrationTest.kt | 10 +++--- .../SentryUserProviderEventProcessorTest.kt | 4 +-- sentry-test-support/build.gradle.kts | 2 +- .../main/kotlin/io/sentry/test/assertions.kt | 10 +++--- {sentry-core => sentry}/build.gradle.kts | 2 +- .../io/sentry}/AsyncConnectionFactory.java | 6 ++-- .../src/main/java/io/sentry}/Breadcrumb.java | 4 +-- .../java/io/sentry}/CircularFifoQueue.java | 2 +- .../CredentialsSettingConfigurator.java | 4 +-- .../src/main/java/io/sentry}/DateUtils.java | 2 +- .../java/io/sentry}/DiagnosticLogger.java | 4 +-- .../java/io/sentry}/DirectoryProcessor.java | 12 +++---- .../src/main/java/io/sentry}/Dsn.java | 2 +- ...DuplicateEventDetectionEventProcessor.java | 6 ++-- .../main/java/io/sentry}/EnvelopeReader.java | 2 +- .../main/java/io/sentry}/EnvelopeSender.java | 12 +++---- .../main/java/io/sentry}/EventProcessor.java | 2 +- .../main/java/io/sentry}/GsonSerializer.java | 34 +++++++++---------- .../java/io/sentry}/HttpTransportFactory.java | 8 ++--- .../src/main/java/io/sentry}/Hub.java | 12 +++---- .../src/main/java/io/sentry}/HubAdapter.java | 6 ++-- .../main/java/io/sentry}/IEnvelopeReader.java | 2 +- .../main/java/io/sentry}/IEnvelopeSender.java | 2 +- .../src/main/java/io/sentry}/IHub.java | 6 ++-- .../src/main/java/io/sentry}/ILogger.java | 2 +- .../main/java/io/sentry}/ISentryClient.java | 6 ++-- .../io/sentry}/ISentryExecutorService.java | 2 +- .../src/main/java/io/sentry}/ISerializer.java | 2 +- .../sentry}/IUnknownPropertiesConsumer.java | 2 +- .../src/main/java/io/sentry}/Integration.java | 2 +- .../java/io/sentry}/InvalidDsnException.java | 2 +- .../java/io/sentry}/MainEventProcessor.java | 8 ++--- .../java/io/sentry}/NoOpEnvelopeReader.java | 2 +- .../src/main/java/io/sentry}/NoOpHub.java | 6 ++-- .../src/main/java/io/sentry}/NoOpLogger.java | 2 +- .../java/io/sentry}/NoOpSentryClient.java | 4 +-- .../main/java/io/sentry}/NoOpSerializer.java | 2 +- .../java/io/sentry}/OptionsContainer.java | 2 +- .../main/java/io/sentry}/OutboxSender.java | 18 +++++----- .../src/main/java/io/sentry}/Scope.java | 6 ++-- .../main/java/io/sentry}/ScopeCallback.java | 2 +- ...achedEnvelopeFireAndForgetIntegration.java | 4 +-- .../SendFireAndForgetEnvelopeSender.java | 4 +-- .../SendFireAndForgetOutboxSender.java | 4 +-- .../src/main/java/io/sentry}/Sentry.java | 8 ++--- .../main/java/io/sentry}/SentryClient.java | 18 +++++----- .../main/java/io/sentry}/SentryEnvelope.java | 8 ++--- .../java/io/sentry}/SentryEnvelopeHeader.java | 6 ++-- .../sentry}/SentryEnvelopeHeaderAdapter.java | 8 ++--- .../java/io/sentry}/SentryEnvelopeItem.java | 4 +-- .../io/sentry}/SentryEnvelopeItemHeader.java | 4 +-- .../SentryEnvelopeItemHeaderAdapter.java | 4 +-- .../src/main/java/io/sentry}/SentryEvent.java | 4 +-- .../io/sentry}/SentryExceptionFactory.java | 12 +++---- .../io/sentry}/SentryExecutorService.java | 2 +- .../main/java/io/sentry}/SentryItemType.java | 2 +- .../src/main/java/io/sentry}/SentryLevel.java | 2 +- .../main/java/io/sentry}/SentryOptions.java | 18 +++++----- .../io/sentry}/SentryStackTraceFactory.java | 4 +-- .../java/io/sentry}/SentryThreadFactory.java | 10 +++--- .../main/java/io/sentry}/SentryValues.java | 2 +- .../src/main/java/io/sentry}/Session.java | 4 +-- .../main/java/io/sentry}/SessionAdapter.java | 6 ++-- .../io/sentry}/ShutdownHookIntegration.java | 4 +-- .../io/sentry}/SynchronizedCollection.java | 2 +- .../java/io/sentry}/SynchronizedQueue.java | 2 +- .../main/java/io/sentry}/SystemOutLogger.java | 2 +- .../io/sentry}/UncaughtExceptionHandler.java | 2 +- .../UncaughtExceptionHandlerIntegration.java | 16 ++++----- .../UnknownPropertiesTypeAdapterFactory.java | 2 +- .../adapters/ContextsDeserializerAdapter.java | 20 +++++------ .../adapters/ContextsSerializerAdapter.java | 8 ++--- .../adapters/DateDeserializerAdapter.java | 8 ++--- .../adapters/DateSerializerAdapter.java | 8 ++--- .../OrientationDeserializerAdapter.java | 8 ++--- .../OrientationSerializerAdapter.java | 8 ++--- .../adapters/SentryIdDeserializerAdapter.java | 8 ++--- .../adapters/SentryIdSerializerAdapter.java | 8 ++--- .../SentryLevelDeserializerAdapter.java | 6 ++-- .../SentryLevelSerializerAdapter.java | 6 ++-- .../adapters/TimeZoneDeserializerAdapter.java | 6 ++-- .../adapters/TimeZoneSerializerAdapter.java | 6 ++-- .../java/io/sentry}/cache/CacheStrategy.java | 24 ++++++------- .../java/io/sentry}/cache/EnvelopeCache.java | 30 ++++++++-------- .../java/io/sentry}/cache/IEnvelopeCache.java | 4 +-- .../ExceptionMechanismException.java | 8 ++--- .../java/io/sentry}/hints/ApplyScopeData.java | 2 +- .../main/java/io/sentry}/hints/Cached.java | 2 +- .../sentry}/hints/DiskFlushNotification.java | 2 +- .../main/java/io/sentry}/hints/Flushable.java | 2 +- .../main/java/io/sentry}/hints/Retryable.java | 2 +- .../java/io/sentry}/hints/SessionEnd.java | 2 +- .../java/io/sentry}/hints/SessionEndHint.java | 2 +- .../java/io/sentry}/hints/SessionStart.java | 2 +- .../io/sentry}/hints/SessionStartHint.java | 2 +- .../io/sentry}/hints/SubmissionResult.java | 2 +- .../main/java/io/sentry}/protocol/App.java | 6 ++-- .../java/io/sentry}/protocol/Browser.java | 6 ++-- .../java/io/sentry}/protocol/Contexts.java | 2 +- .../java/io/sentry}/protocol/DebugImage.java | 4 +-- .../java/io/sentry}/protocol/DebugMeta.java | 4 +-- .../main/java/io/sentry}/protocol/Device.java | 6 ++-- .../main/java/io/sentry}/protocol/Gpu.java | 6 ++-- .../java/io/sentry}/protocol/Mechanism.java | 4 +-- .../java/io/sentry}/protocol/Message.java | 4 +-- .../io/sentry}/protocol/OperatingSystem.java | 6 ++-- .../java/io/sentry}/protocol/Request.java | 4 +-- .../java/io/sentry}/protocol/SdkInfo.java | 4 +-- .../java/io/sentry}/protocol/SdkVersion.java | 4 +-- .../io/sentry}/protocol/SentryException.java | 4 +-- .../java/io/sentry}/protocol/SentryId.java | 2 +- .../io/sentry}/protocol/SentryPackage.java | 4 +-- .../io/sentry}/protocol/SentryRuntime.java | 6 ++-- .../io/sentry}/protocol/SentryStackFrame.java | 4 +-- .../io/sentry}/protocol/SentryStackTrace.java | 4 +-- .../io/sentry}/protocol/SentryThread.java | 4 +-- .../main/java/io/sentry}/protocol/User.java | 6 ++-- .../io/sentry}/transport/AsyncConnection.java | 26 +++++++------- .../java/io/sentry}/transport/Connection.java | 4 +-- .../transport/CurrentDateProvider.java | 2 +- .../io/sentry}/transport/HttpTransport.java | 24 ++++++------- .../transport/IConnectionConfigurator.java | 2 +- .../transport/ICurrentDateProvider.java | 2 +- .../java/io/sentry}/transport/ITransport.java | 4 +-- .../io/sentry}/transport/ITransportGate.java | 2 +- .../sentry}/transport/NoOpEnvelopeCache.java | 6 ++-- .../io/sentry}/transport/NoOpTransport.java | 4 +-- .../sentry}/transport/NoOpTransportGate.java | 2 +- .../transport/QueuedThreadPoolExecutor.java | 6 ++-- .../io/sentry}/transport/StdoutTransport.java | 8 ++--- .../io/sentry}/transport/TransportResult.java | 4 +-- .../java/io/sentry}/util/ApplyScopeUtils.java | 6 ++-- .../java/io/sentry}/util/CollectionUtils.java | 2 +- .../main/java/io/sentry}/util/LogUtils.java | 6 ++-- .../main/java/io/sentry}/util/Objects.java | 2 +- .../java/io/sentry}/util/StringUtils.java | 2 +- .../test/java/io/sentry}/BreadcrumbTest.kt | 2 +- sentry/src/test/java/io/sentry/CachedEvent.kt | 5 +++ .../java/io/sentry}/CustomEventProcessor.kt | 2 +- .../src/test/java/io/sentry}/DateUtilsTest.kt | 2 +- .../java/io/sentry}/DiagnosticLoggerTest.kt | 2 +- .../java/io/sentry}/DirectoryProcessorTest.kt | 8 ++--- .../src/test/java/io/sentry}/DsnTest.kt | 2 +- ...plicateEventDetectionEventProcessorTest.kt | 6 ++-- .../java/io/sentry}/EnvelopeSenderTest.kt | 8 ++--- .../test/java/io/sentry}/FileFromResources.kt | 2 +- .../java/io/sentry}/GsonSerializerTest.kt | 8 ++--- .../io/sentry}/HttpTransportFactoryTest.kt | 2 +- .../src/test/java/io/sentry}/HubTest.kt | 10 +++--- .../java/io/sentry}/MainEventProcessorTest.kt | 8 ++--- .../src/test/java/io/sentry}/NoOpHubTest.kt | 4 +-- .../java/io/sentry}/NoOpSentryClientTest.kt | 4 +-- .../java/io/sentry}/NoOpSerializerTest.kt | 2 +- .../java/io/sentry}/OptionsContainerTest.kt | 2 +- .../test/java/io/sentry}/OutboxSenderTest.kt | 16 ++++----- .../src/test/java/io/sentry}/SampleDsn.kt | 2 +- .../src/test/java/io/sentry}/ScopeTest.kt | 4 +-- ...hedEnvelopeFireAndForgetIntegrationTest.kt | 2 +- .../test/java/io/sentry}/SentryClientTest.kt | 26 +++++++------- .../java/io/sentry}/SentryEnvelopeItemTest.kt | 4 +-- .../java/io/sentry}/SentryEnvelopeTest.kt | 2 +- .../test/java/io/sentry}/SentryEventTest.kt | 8 ++--- .../io/sentry}/SentryExceptionFactoryTest.kt | 6 ++-- .../io/sentry}/SentryExecutorServiceTest.kt | 2 +- .../java/io/sentry}/SentryItemTypeTest.kt | 2 +- .../test/java/io/sentry}/SentryOptionsTest.kt | 4 +-- .../io/sentry}/SentryStackTraceFactoryTest.kt | 2 +- .../src/test/java/io/sentry}/SentryTest.kt | 2 +- .../io/sentry}/SentryThreadFactoryTest.kt | 2 +- .../test/java/io/sentry}/SentryValuesTest.kt | 2 +- .../src/test/java/io/sentry}/SessionTest.kt | 4 +-- .../io/sentry}/ShutdownHookIntegrationTest.kt | 2 +- .../test/java/io/sentry}/StringExtensions.kt | 2 +- ...UncaughtExceptionHandlerIntegrationTest.kt | 8 ++--- .../io/sentry}/cache/CacheStrategyTest.kt | 12 +++---- .../io/sentry}/cache/EnvelopeCacheTest.kt | 24 ++++++------- .../test/java/io/sentry}/protocol/AppTest.kt | 2 +- .../java/io/sentry}/protocol/BrowserTest.kt | 2 +- .../java/io/sentry}/protocol/ContextsTest.kt | 2 +- .../java/io/sentry}/protocol/DeviceTest.kt | 2 +- .../test/java/io/sentry}/protocol/GpuTest.kt | 2 +- .../sentry}/protocol/OperatingSystemTest.kt | 2 +- .../io/sentry}/protocol/SentryRuntimeTest.kt | 2 +- .../test/java/io/sentry}/protocol/UserTest.kt | 2 +- .../sentry}/transport/AsyncConnectionTest.kt | 22 ++++++------ .../io/sentry}/transport/HttpTransportTest.kt | 14 ++++---- .../transport/QueuedThreadPoolExecutorTest.kt | 2 +- .../sentry}/transport/StdoutTransportTest.kt | 8 ++--- .../io/sentry}/util/ApplyScopeUtilsTest.kt | 6 ++-- .../test/java/io/sentry}/util/Extensions.kt | 4 +-- .../java/io/sentry}/util/StringUtilsTest.kt | 2 +- .../resources/envelope-event-attachment.txt | 0 .../test/resources/envelope-session-start.txt | 0 .../src/test/resources/envelope_session.txt | 0 .../resources/envelope_session_sdkversion.txt | 0 .../src/test/resources/event.json | 0 .../test/resources/event_breadcrumb_data.json | 0 .../test/resources/event_with_contexts.json | 0 .../org.mockito.plugins.MockMaker | 0 .../src/test/resources/session.json | 0 settings.gradle.kts | 4 +-- 293 files changed, 860 insertions(+), 860 deletions(-) delete mode 100644 sentry-core/src/test/java/io/sentry/core/CachedEvent.kt rename {sentry-core => sentry}/build.gradle.kts (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/AsyncConnectionFactory.java (81%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Breadcrumb.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/CircularFifoQueue.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/CredentialsSettingConfigurator.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/DateUtils.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/DiagnosticLogger.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/DirectoryProcessor.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Dsn.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/DuplicateEventDetectionEventProcessor.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/EnvelopeReader.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/EnvelopeSender.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/EventProcessor.java (86%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/GsonSerializer.java (88%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/HttpTransportFactory.java (83%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Hub.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/HubAdapter.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/IEnvelopeReader.java (91%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/IEnvelopeSender.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/IHub.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ILogger.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ISentryClient.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ISentryExecutorService.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ISerializer.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/IUnknownPropertiesConsumer.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Integration.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/InvalidDsnException.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/MainEventProcessor.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/NoOpEnvelopeReader.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/NoOpHub.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/NoOpLogger.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/NoOpSentryClient.java (92%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/NoOpSerializer.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/OptionsContainer.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/OutboxSender.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Scope.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ScopeCallback.java (71%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SendCachedEnvelopeFireAndForgetIntegration.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SendFireAndForgetEnvelopeSender.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SendFireAndForgetOutboxSender.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Sentry.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryClient.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelope.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelopeHeader.java (88%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelopeHeaderAdapter.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelopeItem.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelopeItemHeader.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEnvelopeItemHeaderAdapter.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryEvent.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryExceptionFactory.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryExecutorService.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryItemType.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryLevel.java (87%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryOptions.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryStackTraceFactory.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryThreadFactory.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SentryValues.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/Session.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SessionAdapter.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/ShutdownHookIntegration.java (92%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SynchronizedCollection.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SynchronizedQueue.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/SystemOutLogger.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/UncaughtExceptionHandler.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/UncaughtExceptionHandlerIntegration.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/UnknownPropertiesTypeAdapterFactory.java (99%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/ContextsDeserializerAdapter.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/ContextsSerializerAdapter.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/DateDeserializerAdapter.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/DateSerializerAdapter.java (86%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/OrientationDeserializerAdapter.java (88%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/OrientationSerializerAdapter.java (87%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/SentryIdDeserializerAdapter.java (86%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/SentryIdSerializerAdapter.java (85%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/SentryLevelDeserializerAdapter.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/SentryLevelSerializerAdapter.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/TimeZoneDeserializerAdapter.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/adapters/TimeZoneSerializerAdapter.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/cache/CacheStrategy.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/cache/EnvelopeCache.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/cache/IEnvelopeCache.java (81%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/exception/ExceptionMechanismException.java (83%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/ApplyScopeData.java (86%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/Cached.java (76%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/DiskFlushNotification.java (68%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/Flushable.java (79%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/Retryable.java (74%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/SessionEnd.java (74%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/SessionEndHint.java (66%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/SessionStart.java (75%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/SessionStartHint.java (68%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/hints/SubmissionResult.java (76%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/App.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Browser.java (91%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Contexts.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/DebugImage.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/DebugMeta.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Device.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Gpu.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Mechanism.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Message.java (92%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/OperatingSystem.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/Request.java (95%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SdkInfo.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SdkVersion.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryException.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryId.java (98%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryPackage.java (88%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryRuntime.java (92%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryStackFrame.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryStackTrace.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/SentryThread.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/protocol/User.java (96%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/AsyncConnection.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/Connection.java (81%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/CurrentDateProvider.java (92%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/HttpTransport.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/IConnectionConfigurator.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/ICurrentDateProvider.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/ITransport.java (79%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/ITransportGate.java (94%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/NoOpEnvelopeCache.java (84%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/NoOpTransport.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/NoOpTransportGate.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/QueuedThreadPoolExecutor.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/StdoutTransport.java (89%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/transport/TransportResult.java (93%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/util/ApplyScopeUtils.java (85%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/util/CollectionUtils.java (97%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/util/LogUtils.java (87%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/util/Objects.java (90%) rename {sentry-core/src/main/java/io/sentry/core => sentry/src/main/java/io/sentry}/util/StringUtils.java (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/BreadcrumbTest.kt (99%) create mode 100644 sentry/src/test/java/io/sentry/CachedEvent.kt rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/CustomEventProcessor.kt (84%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/DateUtilsTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/DiagnosticLoggerTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/DirectoryProcessorTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/DsnTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/DuplicateEventDetectionEventProcessorTest.kt (94%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/EnvelopeSenderTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/FileFromResources.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/GsonSerializerTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/HttpTransportFactoryTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/HubTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/MainEventProcessorTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/NoOpHubTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/NoOpSentryClientTest.kt (94%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/NoOpSerializerTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/OptionsContainerTest.kt (92%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/OutboxSenderTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SampleDsn.kt (93%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/ScopeTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SendCachedEnvelopeFireAndForgetIntegrationTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryClientTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryEnvelopeItemTest.kt (92%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryEnvelopeTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryEventTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryExceptionFactoryTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryExecutorServiceTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryItemTypeTest.kt (93%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryOptionsTest.kt (98%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryStackTraceFactoryTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryThreadFactoryTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SentryValuesTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/SessionTest.kt (98%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/ShutdownHookIntegrationTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/StringExtensions.kt (87%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/UncaughtExceptionHandlerIntegrationTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/cache/CacheStrategyTest.kt (96%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/cache/EnvelopeCacheTest.kt (92%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/AppTest.kt (98%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/BrowserTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/ContextsTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/DeviceTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/GpuTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/OperatingSystemTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/SentryRuntimeTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/protocol/UserTest.kt (98%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/transport/AsyncConnectionTest.kt (95%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/transport/HttpTransportTest.kt (97%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/transport/QueuedThreadPoolExecutorTest.kt (99%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/transport/StdoutTransportTest.kt (85%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/util/ApplyScopeUtilsTest.kt (88%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/util/Extensions.kt (64%) rename {sentry-core/src/test/java/io/sentry/core => sentry/src/test/java/io/sentry}/util/StringUtilsTest.kt (98%) rename {sentry-core => sentry}/src/test/resources/envelope-event-attachment.txt (100%) rename {sentry-core => sentry}/src/test/resources/envelope-session-start.txt (100%) rename {sentry-core => sentry}/src/test/resources/envelope_session.txt (100%) rename {sentry-core => sentry}/src/test/resources/envelope_session_sdkversion.txt (100%) rename {sentry-core => sentry}/src/test/resources/event.json (100%) rename {sentry-core => sentry}/src/test/resources/event_breadcrumb_data.json (100%) rename {sentry-core => sentry}/src/test/resources/event_with_contexts.json (100%) rename {sentry-core => sentry}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) rename {sentry-core => sentry}/src/test/resources/session.json (100%) diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 6eb3a5d93..fb25b4332 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -72,7 +72,7 @@ android { } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) // lifecycle processor, session tracking implementation(Config.Libs.lifecycleProcess) diff --git a/sentry-android-core/proguard-rules.pro b/sentry-android-core/proguard-rules.pro index f96074f8e..c196022e4 100644 --- a/sentry-android-core/proguard-rules.pro +++ b/sentry-android-core/proguard-rules.pro @@ -11,7 +11,7 @@ -keep class com.google.gson.** { *; } # Application classes that will be serialized/deserialized over Gson --keep class io.sentry.core.** { *; } +-keep class io.sentry.** { *; } -keepclassmembers enum * { *; } -keep class io.sentry.android.core.** { *; } diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ANRWatchDog.java b/sentry-android-core/src/main/java/io/sentry/android/core/ANRWatchDog.java index 6e10b00bd..b16087a05 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ANRWatchDog.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ANRWatchDog.java @@ -7,8 +7,8 @@ import android.app.ActivityManager; import android.content.Context; import android.os.Debug; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityBreadcrumbsIntegration.java index d3e438589..bb1274534 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityBreadcrumbsIntegration.java @@ -5,12 +5,12 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLogger.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLogger.java index 972fc93e2..f1fd6f079 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLogger.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidLogger.java @@ -1,8 +1,8 @@ package io.sentry.android.core; import android.util.Log; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; final class AndroidLogger implements ILogger { diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java index d58393b40..2069fa120 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java @@ -6,13 +6,13 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.Build; -import io.sentry.core.ILogger; -import io.sentry.core.SendCachedEnvelopeFireAndForgetIntegration; -import io.sentry.core.SendFireAndForgetEnvelopeSender; -import io.sentry.core.SendFireAndForgetOutboxSender; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.ILogger; +import io.sentry.SendCachedEnvelopeFireAndForgetIntegration; +import io.sentry.SendFireAndForgetEnvelopeSender; +import io.sentry.SendFireAndForgetOutboxSender; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.io.File; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -124,7 +124,7 @@ private static void installDefaultIntegrations( final Class sentryNdkClass = loadNdkIfAvailable(options, buildInfoProvider, loadClass); options.addIntegration(new NdkIntegration(sentryNdkClass)); - // this integration uses android.os.FileObserver, we can't move to sentry-core + // this integration uses android.os.FileObserver, we can't move to sentry // before creating a pure java impl. options.addIntegration(EnvelopeFileObserverIntegration.getOutboxFileObserver()); diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java index f0469c978..4b9f800c9 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java @@ -1,9 +1,9 @@ package io.sentry.android.core; import android.content.Context; +import io.sentry.ILogger; import io.sentry.android.core.util.ConnectivityChecker; -import io.sentry.core.ILogger; -import io.sentry.core.transport.ITransportGate; +import io.sentry.transport.ITransportGate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java index c83744d8c..d82689fd5 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AnrIntegration.java @@ -2,14 +2,14 @@ import android.annotation.SuppressLint; import android.content.Context; -import io.sentry.core.IHub; -import io.sentry.core.ILogger; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.exception.ExceptionMechanismException; -import io.sentry.core.protocol.Mechanism; -import io.sentry.core.util.Objects; +import io.sentry.IHub; +import io.sentry.ILogger; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.protocol.Mechanism; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java index 53c45f88d..ce2b3b58a 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java @@ -5,14 +5,14 @@ import android.content.res.Configuration; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; import io.sentry.android.core.util.DeviceOrientations; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.Device; -import io.sentry.core.util.Objects; +import io.sentry.protocol.Device; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import java.util.Locale; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppLifecycleIntegration.java index 6f097bb71..ae163a8b6 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AppLifecycleIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AppLifecycleIntegration.java @@ -1,12 +1,12 @@ package io.sentry.android.core; import androidx.lifecycle.ProcessLifecycleOwner; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; import io.sentry.android.core.util.MainThreadChecker; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationNotResponding.java b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationNotResponding.java index c346d4293..7299cd29d 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationNotResponding.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ApplicationNotResponding.java @@ -2,7 +2,7 @@ // Based on the class above. The API unnecessary here was removed. package io.sentry.android.core; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.NotNull; /** diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java b/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java index cdd3dcdd6..ff4cd9d60 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ContextUtils.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.os.Build; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java index 304afa861..e1564e859 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java @@ -18,24 +18,24 @@ import android.os.SystemClock; import android.provider.Settings; import android.util.DisplayMetrics; +import io.sentry.DateUtils; +import io.sentry.EventProcessor; +import io.sentry.ILogger; +import io.sentry.SentryEvent; +import io.sentry.SentryLevel; import io.sentry.android.core.util.ConnectivityChecker; import io.sentry.android.core.util.DeviceOrientations; import io.sentry.android.core.util.MainThreadChecker; import io.sentry.android.core.util.RootChecker; -import io.sentry.core.DateUtils; -import io.sentry.core.EventProcessor; -import io.sentry.core.ILogger; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.App; -import io.sentry.core.protocol.DebugImage; -import io.sentry.core.protocol.DebugMeta; -import io.sentry.core.protocol.Device; -import io.sentry.core.protocol.OperatingSystem; -import io.sentry.core.protocol.SentryThread; -import io.sentry.core.protocol.User; -import io.sentry.core.util.ApplyScopeUtils; -import io.sentry.core.util.Objects; +import io.sentry.protocol.App; +import io.sentry.protocol.DebugImage; +import io.sentry.protocol.DebugMeta; +import io.sentry.protocol.Device; +import io.sentry.protocol.OperatingSystem; +import io.sentry.protocol.SentryThread; +import io.sentry.protocol.User; +import io.sentry.util.ApplyScopeUtils; +import io.sentry.util.Objects; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.File; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java index 4061fdae9..b7b2d2abe 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java @@ -1,17 +1,17 @@ package io.sentry.android.core; -import static io.sentry.core.SentryLevel.ERROR; +import static io.sentry.SentryLevel.ERROR; import android.os.FileObserver; -import io.sentry.core.IEnvelopeSender; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.hints.ApplyScopeData; -import io.sentry.core.hints.Cached; -import io.sentry.core.hints.Flushable; -import io.sentry.core.hints.Retryable; -import io.sentry.core.hints.SubmissionResult; -import io.sentry.core.util.Objects; +import io.sentry.IEnvelopeSender; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.hints.ApplyScopeData; +import io.sentry.hints.Cached; +import io.sentry.hints.Flushable; +import io.sentry.hints.Retryable; +import io.sentry.hints.SubmissionResult; +import io.sentry.util.Objects; import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java index 340fd9e92..2e6947da5 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java @@ -1,12 +1,12 @@ package io.sentry.android.core; -import io.sentry.core.IHub; -import io.sentry.core.ILogger; -import io.sentry.core.Integration; -import io.sentry.core.OutboxSender; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.IHub; +import io.sentry.ILogger; +import io.sentry.Integration; +import io.sentry.OutboxSender; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.io.Closeable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java b/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java index a83ea1a44..b0a435f06 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/LifecycleWatcher.java @@ -2,11 +2,11 @@ import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.SentryLevel; -import io.sentry.core.transport.CurrentDateProvider; -import io.sentry.core.transport.ICurrentDateProvider; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.SentryLevel; +import io.sentry.transport.CurrentDateProvider; +import io.sentry.transport.ICurrentDateProvider; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java b/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java index 6077b528d..e774219ac 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java @@ -4,9 +4,9 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.util.Objects; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.util.Objects; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/NdkIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/NdkIntegration.java index 5d0022e09..497192370 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/NdkIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/NdkIntegration.java @@ -1,10 +1,10 @@ package io.sentry.android.core; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.lang.reflect.Method; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegration.java index bb8654e34..91a59f10e 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegration.java @@ -8,13 +8,13 @@ import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import androidx.annotation.Nullable; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; import io.sentry.android.core.util.Permissions; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java index bebd25e60..0bf9fcb99 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java @@ -1,10 +1,10 @@ package io.sentry.android.core; import android.content.Context; -import io.sentry.core.ILogger; -import io.sentry.core.OptionsContainer; -import io.sentry.core.Sentry; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.OptionsContainer; +import io.sentry.Sentry; +import io.sentry.SentryLevel; import java.lang.reflect.InvocationTargetException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java index 0c10ba972..9e98a78a7 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java @@ -1,7 +1,7 @@ package io.sentry.android.core; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.SdkVersion; +import io.sentry.SentryOptions; +import io.sentry.protocol.SdkVersion; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryInitProvider.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryInitProvider.java index 0a5317267..d4e5b30e5 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryInitProvider.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryInitProvider.java @@ -6,8 +6,8 @@ import android.content.pm.ProviderInfo; import android.database.Cursor; import android.net.Uri; -import io.sentry.core.Sentry; -import io.sentry.core.SentryLevel; +import io.sentry.Sentry; +import io.sentry.SentryLevel; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java index 017cfc382..921ee5aa8 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java @@ -37,14 +37,14 @@ import android.content.IntentFilter; import android.os.Bundle; import androidx.annotation.Nullable; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.ILogger; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; -import io.sentry.core.util.StringUtils; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.ILogger; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; +import io.sentry.util.StringUtils; import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java index c93991130..a91b0d69d 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java @@ -8,12 +8,12 @@ import android.hardware.SensorEventListener; import android.hardware.SensorManager; import androidx.annotation.Nullable; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/ConnectivityChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/ConnectivityChecker.java index 02b23437c..a9f8e0fe8 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/util/ConnectivityChecker.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/util/ConnectivityChecker.java @@ -7,9 +7,9 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.os.Build; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import io.sentry.android.core.IBuildInfoProvider; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/DeviceOrientations.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/DeviceOrientations.java index 597c3d68a..638298b66 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/util/DeviceOrientations.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/util/DeviceOrientations.java @@ -1,7 +1,7 @@ package io.sentry.android.core.util; import android.content.res.Configuration; -import io.sentry.core.protocol.Device; +import io.sentry.protocol.Device; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/MainThreadChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/MainThreadChecker.java index ea0d9f17e..c6233af9c 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/util/MainThreadChecker.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/util/MainThreadChecker.java @@ -1,7 +1,7 @@ package io.sentry.android.core.util; import android.os.Looper; -import io.sentry.core.protocol.SentryThread; +import io.sentry.protocol.SentryThread; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/Permissions.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/Permissions.java index 3fd2f0e5c..1df9bf390 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/util/Permissions.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/util/Permissions.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Process; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/util/RootChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/util/RootChecker.java index 321664203..7c2e4bfab 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/util/RootChecker.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/util/RootChecker.java @@ -2,10 +2,10 @@ import android.content.Context; import android.content.pm.PackageManager; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import io.sentry.android.core.IBuildInfoProvider; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.io.BufferedReader; import java.io.File; import java.io.IOException; diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityBreadcrumbsIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityBreadcrumbsIntegrationTest.kt index 2c2306b04..0d77c3e23 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityBreadcrumbsIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityBreadcrumbsIntegrationTest.kt @@ -6,9 +6,9 @@ import com.nhaarman.mockitokotlin2.check import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt index 658935874..ef1fa0c5f 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt @@ -11,11 +11,11 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.ILogger -import io.sentry.core.MainEventProcessor -import io.sentry.core.SendCachedEnvelopeFireAndForgetIntegration -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions +import io.sentry.ILogger +import io.sentry.MainEventProcessor +import io.sentry.SendCachedEnvelopeFireAndForgetIntegration +import io.sentry.SentryLevel +import io.sentry.SentryOptions import java.io.File import java.lang.RuntimeException import kotlin.test.BeforeTest diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AnrIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AnrIntegrationTest.kt index c292c6423..14d55987a 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AnrIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AnrIntegrationTest.kt @@ -3,7 +3,7 @@ package io.sentry.android.core import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.IHub +import io.sentry.IHub import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegrationTest.kt index 8bbe23106..0bda79e75 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegrationTest.kt @@ -10,9 +10,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel import java.lang.NullPointerException import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AppLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AppLifecycleIntegrationTest.kt index 084f6268a..614962269 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/AppLifecycleIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/AppLifecycleIntegrationTest.kt @@ -4,7 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.IHub +import io.sentry.IHub import java.util.concurrent.CountDownLatch import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/CachedEvent.kt b/sentry-android-core/src/test/java/io/sentry/android/core/CachedEvent.kt index caee1a774..486404a14 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/CachedEvent.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/CachedEvent.kt @@ -1,5 +1,5 @@ package io.sentry.android.core -import io.sentry.core.hints.Cached +import io.sentry.hints.Cached class CachedEvent : Cached diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt index d227d9524..3a9961a46 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt @@ -9,18 +9,18 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify +import io.sentry.DiagnosticLogger +import io.sentry.ILogger +import io.sentry.SentryEvent +import io.sentry.SentryLevel +import io.sentry.SentryOptions import io.sentry.android.core.DefaultAndroidEventProcessor.ANDROID_ID import io.sentry.android.core.DefaultAndroidEventProcessor.EMULATOR import io.sentry.android.core.DefaultAndroidEventProcessor.KERNEL_VERSION import io.sentry.android.core.DefaultAndroidEventProcessor.PROGUARD_UUID import io.sentry.android.core.DefaultAndroidEventProcessor.ROOTED -import io.sentry.core.DiagnosticLogger -import io.sentry.core.ILogger -import io.sentry.core.SentryEvent -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.protocol.SdkVersion -import io.sentry.core.protocol.SentryThread +import io.sentry.protocol.SdkVersion +import io.sentry.protocol.SentryThread import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverIntegrationTest.kt index 55d22aff7..2899c2c83 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverIntegrationTest.kt @@ -3,9 +3,9 @@ package io.sentry.android.core import androidx.test.ext.junit.runners.AndroidJUnit4 import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Hub -// import io.sentry.core.HubAdapter -import io.sentry.core.SentryOptions +import io.sentry.Hub +// import io.sentry.HubAdapter +import io.sentry.SentryOptions import java.io.File import java.nio.file.Files import kotlin.test.AfterTest diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverTest.kt index b28af8ef9..d0ecd315b 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/EnvelopeFileObserverTest.kt @@ -10,10 +10,10 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyZeroInteractions -import io.sentry.core.IEnvelopeSender -import io.sentry.core.ILogger -import io.sentry.core.SentryOptions -import io.sentry.core.hints.ApplyScopeData +import io.sentry.IEnvelopeSender +import io.sentry.ILogger +import io.sentry.SentryOptions +import io.sentry.hints.ApplyScopeData import java.io.File import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt index 3b1091af8..58e7c77d0 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/LifecycleWatcherTest.kt @@ -8,10 +8,10 @@ import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.times import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel -import io.sentry.core.transport.ICurrentDateProvider +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel +import io.sentry.transport.ICurrentDateProvider import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt index 08b8ca85d..392d3a1ec 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt @@ -7,8 +7,8 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.ILogger -import io.sentry.core.SentryLevel +import io.sentry.ILogger +import io.sentry.SentryLevel import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/NdkIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/NdkIntegrationTest.kt index 3d9ed591f..717bfbc9c 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/NdkIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/NdkIntegrationTest.kt @@ -5,9 +5,9 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.ILogger -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions +import io.sentry.ILogger +import io.sentry.SentryLevel +import io.sentry.SentryOptions import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegrationTest.kt index 7bc7b61ee..0a7dcd8f5 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegrationTest.kt @@ -10,9 +10,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt index c43297577..323b911a7 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt @@ -31,7 +31,7 @@ class SentryAndroidOptionsTest { }) assertTrue(sdkVersion.packages!!.any { - it.name == "maven:sentry-core" && + it.name == "maven:sentry" && it.version == BuildConfig.VERSION_NAME }) } diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt index f0ec60762..ecf41c538 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt @@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.ILogger -import io.sentry.core.Sentry -import io.sentry.core.SentryLevel +import io.sentry.ILogger +import io.sentry.Sentry +import io.sentry.SentryLevel import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt index f90b689ae..345d550d4 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt @@ -4,9 +4,9 @@ import android.content.pm.ProviderInfo import android.os.Bundle import androidx.test.ext.junit.runners.AndroidJUnit4 import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.ILogger -import io.sentry.core.InvalidDsnException -import io.sentry.core.Sentry +import io.sentry.ILogger +import io.sentry.InvalidDsnException +import io.sentry.Sentry import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertFailsWith diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryNdk.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryNdk.kt index dca1cf09e..b112c8d27 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryNdk.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryNdk.kt @@ -1,6 +1,6 @@ package io.sentry.android.core -import io.sentry.core.SentryOptions +import io.sentry.SentryOptions class SentryNdk { companion object { diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt index 894a941ae..81f6a7e2e 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegrationTest.kt @@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.check import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/TempSensorBreadcrumbsIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/TempSensorBreadcrumbsIntegrationTest.kt index 7fdddce9b..1d31a4077 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/TempSensorBreadcrumbsIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/TempSensorBreadcrumbsIntegrationTest.kt @@ -12,9 +12,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/util/DeviceOrientationsTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/util/DeviceOrientationsTest.kt index b1a8130ba..f0148f67e 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/util/DeviceOrientationsTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/util/DeviceOrientationsTest.kt @@ -5,7 +5,7 @@ import android.content.res.Configuration.ORIENTATION_PORTRAIT import android.content.res.Configuration.ORIENTATION_SQUARE import android.content.res.Configuration.ORIENTATION_UNDEFINED import io.sentry.android.core.util.DeviceOrientations.getOrientation -import io.sentry.core.protocol.Device +import io.sentry.protocol.Device import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/util/MainThreadCheckerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/util/MainThreadCheckerTest.kt index 95ba09e43..5619200c8 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/util/MainThreadCheckerTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/util/MainThreadCheckerTest.kt @@ -1,7 +1,7 @@ package io.sentry.android.core.util import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.sentry.core.protocol.SentryThread +import io.sentry.protocol.SentryThread import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/util/RootCheckerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/util/RootCheckerTest.kt index 6474bf3b1..a17b19694 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/util/RootCheckerTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/util/RootCheckerTest.kt @@ -8,8 +8,8 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever +import io.sentry.ILogger import io.sentry.android.core.IBuildInfoProvider -import io.sentry.core.ILogger import java.io.ByteArrayInputStream import java.io.File import java.io.IOException diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 59fded3c3..f59a4cb7b 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -100,7 +100,7 @@ android { } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) api(project(":sentry-android-core")) compileOnly(Config.CompileOnly.jetbrainsAnnotations) diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java index aaecb89f8..faf1e585a 100644 --- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java +++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java @@ -1,6 +1,6 @@ package io.sentry.android.ndk; -import io.sentry.core.SentryOptions; +import io.sentry.SentryOptions; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java index 1b492aa04..e2686fe88 100644 --- a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java +++ b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdkUtil.java @@ -1,6 +1,6 @@ package io.sentry.android.ndk; -import io.sentry.core.protocol.SdkVersion; +import io.sentry.protocol.SdkVersion; import org.jetbrains.annotations.Nullable; /** diff --git a/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt b/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt index f861cc235..0082565cd 100644 --- a/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt +++ b/sentry-android-ndk/src/test/java/io/sentry/android/ndk/SentryNdkUtilTest.kt @@ -1,6 +1,6 @@ package io.sentry.android.ndk -import io.sentry.core.SentryOptions +import io.sentry.SentryOptions import kotlin.test.Test import kotlin.test.assertNull import kotlin.test.assertTrue diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 3a1b82c9c..1bdc04f15 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -67,7 +67,7 @@ android { } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) api(Config.Libs.timber) diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt index 0ddb31e85..58571fcf4 100644 --- a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt +++ b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt @@ -1,11 +1,11 @@ package io.sentry.android.timber -import io.sentry.core.IHub -import io.sentry.core.ILogger -import io.sentry.core.Integration -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.protocol.SdkVersion +import io.sentry.IHub +import io.sentry.ILogger +import io.sentry.Integration +import io.sentry.SentryLevel +import io.sentry.SentryOptions +import io.sentry.protocol.SdkVersion import java.io.Closeable import timber.log.Timber diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt index 0a028e5ff..04e77610c 100644 --- a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt +++ b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt @@ -1,11 +1,11 @@ package io.sentry.android.timber import android.util.Log -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryEvent -import io.sentry.core.SentryLevel -import io.sentry.core.protocol.Message +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryEvent +import io.sentry.SentryLevel +import io.sentry.protocol.Message import timber.log.Timber /** diff --git a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt index 3eb307216..cf6efee20 100644 --- a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt +++ b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt @@ -3,10 +3,10 @@ package io.sentry.android.timber import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.IHub -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.protocol.SdkVersion +import io.sentry.IHub +import io.sentry.SentryLevel +import io.sentry.SentryOptions +import io.sentry.protocol.SdkVersion import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt index c0954b577..ee6dbe92a 100644 --- a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt +++ b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt @@ -5,10 +5,10 @@ import com.nhaarman.mockitokotlin2.check import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Breadcrumb -import io.sentry.core.IHub -import io.sentry.core.SentryLevel -import io.sentry.core.getExc +import io.sentry.Breadcrumb +import io.sentry.IHub +import io.sentry.SentryLevel +import io.sentry.getExc import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-android-timber/src/test/java/io/sentry/core/SentryEventKtx.kt b/sentry-android-timber/src/test/java/io/sentry/core/SentryEventKtx.kt index 329092cfb..95d342f3b 100644 --- a/sentry-android-timber/src/test/java/io/sentry/core/SentryEventKtx.kt +++ b/sentry-android-timber/src/test/java/io/sentry/core/SentryEventKtx.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry /** * package-private hack. diff --git a/sentry-core/src/test/java/io/sentry/core/CachedEvent.kt b/sentry-core/src/test/java/io/sentry/core/CachedEvent.kt deleted file mode 100644 index 6531f40f4..000000000 --- a/sentry-core/src/test/java/io/sentry/core/CachedEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.sentry.core - -import io.sentry.core.hints.Cached - -class CachedEvent : Cached diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index d5c60ab80..00090d222 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -20,7 +20,7 @@ tasks.withType().configureEach } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) implementation(Config.Libs.log4j2Api) implementation(Config.Libs.log4j2Core) diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 39349e757..44da41561 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -1,17 +1,17 @@ package io.sentry.log4j2; -import io.sentry.core.Breadcrumb; -import io.sentry.core.DateUtils; -import io.sentry.core.HubAdapter; -import io.sentry.core.IHub; -import io.sentry.core.Sentry; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.Message; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.transport.ITransport; -import io.sentry.core.util.CollectionUtils; +import io.sentry.Breadcrumb; +import io.sentry.DateUtils; +import io.sentry.HubAdapter; +import io.sentry.IHub; +import io.sentry.Sentry; +import io.sentry.SentryEvent; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.protocol.Message; +import io.sentry.protocol.SdkVersion; +import io.sentry.transport.ITransport; +import io.sentry.util.CollectionUtils; import java.util.Arrays; import java.util.Collections; import java.util.Date; diff --git a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt index 54ffc7918..50ab78fa2 100644 --- a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt +++ b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt @@ -2,10 +2,10 @@ package io.sentry.log4j2 import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.HubAdapter -import io.sentry.core.SentryLevel -import io.sentry.core.transport.ITransport +import io.sentry.HubAdapter +import io.sentry.SentryLevel import io.sentry.test.checkEvent +import io.sentry.transport.ITransport import java.time.Instant import java.time.LocalDateTime import java.time.ZoneId diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 942a171ad..0209b1ca6 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -20,7 +20,7 @@ tasks.withType().configureEach } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) implementation(Config.Libs.logbackClassic) compileOnly(Config.CompileOnly.nopen) diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index 35e69b829..b9d4a5134 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -4,16 +4,16 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; import ch.qos.logback.core.UnsynchronizedAppenderBase; -import io.sentry.core.Breadcrumb; -import io.sentry.core.DateUtils; -import io.sentry.core.Sentry; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.Message; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.transport.ITransport; -import io.sentry.core.util.CollectionUtils; +import io.sentry.Breadcrumb; +import io.sentry.DateUtils; +import io.sentry.Sentry; +import io.sentry.SentryEvent; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.protocol.Message; +import io.sentry.protocol.SdkVersion; +import io.sentry.transport.ITransport; +import io.sentry.util.CollectionUtils; import java.util.Arrays; import java.util.Collections; import java.util.Date; diff --git a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt index 297dce4f7..7def3e5bd 100644 --- a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt +++ b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt @@ -6,11 +6,11 @@ import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.transport.ITransport -import io.sentry.core.transport.TransportResult +import io.sentry.SentryLevel +import io.sentry.SentryOptions import io.sentry.test.checkEvent +import io.sentry.transport.ITransport +import io.sentry.transport.TransportResult import java.time.Instant import java.time.LocalDateTime import java.time.ZoneId diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/sample/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/sample/MainActivity.java index 9a9b367a4..07f21b628 100644 --- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/sample/MainActivity.java +++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/sample/MainActivity.java @@ -2,8 +2,8 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; -import io.sentry.core.Sentry; -import io.sentry.core.protocol.User; +import io.sentry.Sentry; +import io.sentry.protocol.User; import io.sentry.sample.databinding.ActivityMainBinding; import java.util.Collections; diff --git a/sentry-samples/sentry-samples-console/build.gradle.kts b/sentry-samples/sentry-samples-console/build.gradle.kts index 496bd3052..44f48604a 100644 --- a/sentry-samples/sentry-samples-console/build.gradle.kts +++ b/sentry-samples/sentry-samples-console/build.gradle.kts @@ -9,5 +9,5 @@ configure { } dependencies { - implementation(project(":sentry-core")) + implementation(project(":sentry")) } diff --git a/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java b/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java index 2ecd50a29..ae9b2688a 100644 --- a/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java +++ b/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java @@ -1,12 +1,12 @@ package io.sentry.samples.console; -import io.sentry.core.Breadcrumb; -import io.sentry.core.EventProcessor; -import io.sentry.core.Sentry; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.Message; -import io.sentry.core.protocol.User; +import io.sentry.Breadcrumb; +import io.sentry.EventProcessor; +import io.sentry.Sentry; +import io.sentry.SentryEvent; +import io.sentry.SentryLevel; +import io.sentry.protocol.Message; +import io.sentry.protocol.User; import java.util.Collections; public class Main { diff --git a/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java b/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java index 40d17a1c6..1eccfb1a5 100644 --- a/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java +++ b/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java @@ -1,8 +1,8 @@ package io.sentry.samples.spring.boot; -import io.sentry.core.EventProcessor; -import io.sentry.core.SentryEvent; -import io.sentry.core.protocol.SentryRuntime; +import io.sentry.EventProcessor; +import io.sentry.SentryEvent; +import io.sentry.protocol.SentryRuntime; import org.jetbrains.annotations.Nullable; import org.springframework.stereotype.Component; diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index a2adf698b..5f606c037 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -33,7 +33,7 @@ tasks.withType().configureEach { } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) api(project(":sentry-spring")) implementation(Config.Libs.springBootStarter) implementation(Config.Libs.springWeb) diff --git a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java index f47cf467c..3f4a1e9bb 100644 --- a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java +++ b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java @@ -1,18 +1,18 @@ package io.sentry.spring.boot; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.EventProcessor; -import io.sentry.core.HubAdapter; -import io.sentry.core.IHub; -import io.sentry.core.Integration; -import io.sentry.core.Sentry; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.transport.ITransport; -import io.sentry.core.transport.ITransportGate; +import io.sentry.EventProcessor; +import io.sentry.HubAdapter; +import io.sentry.IHub; +import io.sentry.Integration; +import io.sentry.Sentry; +import io.sentry.SentryOptions; +import io.sentry.protocol.SdkVersion; import io.sentry.spring.SentryUserProvider; import io.sentry.spring.SentryUserProviderEventProcessor; import io.sentry.spring.SentryWebConfiguration; +import io.sentry.transport.ITransport; +import io.sentry.transport.ITransportGate; import java.util.List; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.ObjectProvider; diff --git a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryProperties.java b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryProperties.java index 18cb6f4ee..67bb103a6 100644 --- a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryProperties.java +++ b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryProperties.java @@ -1,7 +1,7 @@ package io.sentry.spring.boot; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.SentryOptions; +import io.sentry.SentryOptions; import org.springframework.boot.context.properties.ConfigurationProperties; /** Configuration for Sentry integration. */ diff --git a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt index e78de75df..88dd99fad 100644 --- a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt +++ b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt @@ -3,17 +3,17 @@ package io.sentry.spring.boot import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.Breadcrumb -import io.sentry.core.EventProcessor -import io.sentry.core.IHub -import io.sentry.core.Integration -import io.sentry.core.Sentry -import io.sentry.core.SentryEvent -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.transport.ITransport -import io.sentry.core.transport.ITransportGate +import io.sentry.Breadcrumb +import io.sentry.EventProcessor +import io.sentry.IHub +import io.sentry.Integration +import io.sentry.Sentry +import io.sentry.SentryEvent +import io.sentry.SentryLevel +import io.sentry.SentryOptions import io.sentry.test.checkEvent +import io.sentry.transport.ITransport +import io.sentry.transport.ITransportGate import kotlin.test.Test import org.assertj.core.api.Assertions.assertThat import org.awaitility.kotlin.await diff --git a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentrySpringIntegrationTest.kt b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentrySpringIntegrationTest.kt index 36aef8f0d..808c7ce1f 100644 --- a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentrySpringIntegrationTest.kt +++ b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentrySpringIntegrationTest.kt @@ -1,9 +1,9 @@ package io.sentry.spring.boot import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Sentry -import io.sentry.core.transport.ITransport +import io.sentry.Sentry import io.sentry.test.checkEvent +import io.sentry.transport.ITransport import java.lang.RuntimeException import org.assertj.core.api.Assertions.assertThat import org.awaitility.kotlin.await diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 31d69e95a..fc31b4fd0 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -33,7 +33,7 @@ tasks.withType().configureEach { } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) implementation(Config.Libs.springWeb) implementation(Config.Libs.servletApi) diff --git a/sentry-spring/src/main/java/io/sentry/spring/EnableSentry.java b/sentry-spring/src/main/java/io/sentry/spring/EnableSentry.java index 2ab00f6ee..17b24d66c 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/EnableSentry.java +++ b/sentry-spring/src/main/java/io/sentry/spring/EnableSentry.java @@ -10,8 +10,8 @@ * Enables Sentry error handling capabilities. * *
    - *
  • creates bean of type {@link io.sentry.core.SentryOptions} - *
  • registers {@link io.sentry.core.IHub} for sending Sentry events + *
  • creates bean of type {@link io.sentry.SentryOptions} + *
  • registers {@link io.sentry.IHub} for sending Sentry events *
  • registers {@link SentryRequestFilter} for attaching request information to Sentry events *
  • registers {@link SentryExceptionResolver} to send Sentry event for any uncaught exception * in Spring MVC flow. diff --git a/sentry-spring/src/main/java/io/sentry/spring/HttpServletRequestSentryUserProvider.java b/sentry-spring/src/main/java/io/sentry/spring/HttpServletRequestSentryUserProvider.java index 55776b82a..c24d2c2ff 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/HttpServletRequestSentryUserProvider.java +++ b/sentry-spring/src/main/java/io/sentry/spring/HttpServletRequestSentryUserProvider.java @@ -1,8 +1,8 @@ package io.sentry.spring; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.User; -import io.sentry.core.util.Objects; +import io.sentry.SentryOptions; +import io.sentry.protocol.User; +import io.sentry.util.Objects; import javax.servlet.http.HttpServletRequest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java b/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java index eba7bfbf4..30c76a680 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java @@ -1,12 +1,12 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.IHub; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryLevel; -import io.sentry.core.exception.ExceptionMechanismException; -import io.sentry.core.protocol.Mechanism; -import io.sentry.core.util.Objects; +import io.sentry.IHub; +import io.sentry.SentryEvent; +import io.sentry.SentryLevel; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.protocol.Mechanism; +import io.sentry.util.Objects; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jetbrains.annotations.NotNull; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java b/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java index 3b85dae5c..0fc33653d 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java @@ -1,9 +1,9 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.HubAdapter; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.SdkVersion; +import io.sentry.HubAdapter; +import io.sentry.SentryOptions; +import io.sentry.protocol.SdkVersion; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryInitBeanPostProcessor.java b/sentry-spring/src/main/java/io/sentry/spring/SentryInitBeanPostProcessor.java index 3bae29feb..96c57b7f6 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryInitBeanPostProcessor.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryInitBeanPostProcessor.java @@ -1,8 +1,8 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.Sentry; -import io.sentry.core.SentryOptions; +import io.sentry.Sentry; +import io.sentry.SentryOptions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springframework.beans.BeansException; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestFilter.java b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestFilter.java index d9f22adc2..f72d3b3d5 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestFilter.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestFilter.java @@ -1,10 +1,10 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.Breadcrumb; -import io.sentry.core.IHub; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; +import io.sentry.Breadcrumb; +import io.sentry.IHub; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -14,7 +14,7 @@ import org.springframework.core.Ordered; import org.springframework.web.filter.OncePerRequestFilter; -/** Pushes new {@link io.sentry.core.Scope} on each incoming HTTP request. */ +/** Pushes new {@link io.sentry.Scope} on each incoming HTTP request. */ @Open public class SentryRequestFilter extends OncePerRequestFilter implements Ordered { private final @NotNull IHub hub; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java index ffcb5e2d0..d3f54ae64 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java @@ -1,11 +1,11 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.EventProcessor; -import io.sentry.core.SentryEvent; -import io.sentry.core.SentryOptions; -import io.sentry.core.protocol.Request; -import io.sentry.core.util.Objects; +import io.sentry.EventProcessor; +import io.sentry.SentryEvent; +import io.sentry.SentryOptions; +import io.sentry.protocol.Request; +import io.sentry.util.Objects; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryUserProvider.java b/sentry-spring/src/main/java/io/sentry/spring/SentryUserProvider.java index 724e5676a..6ee1f899a 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryUserProvider.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryUserProvider.java @@ -1,10 +1,10 @@ package io.sentry.spring; -import io.sentry.core.protocol.User; +import io.sentry.protocol.User; import org.jetbrains.annotations.Nullable; /** - * Provides user information that's set on {@link io.sentry.core.SentryEvent} using {@link + * Provides user information that's set on {@link io.sentry.SentryEvent} using {@link * SentryUserProviderEventProcessor}. * *

    Out of the box Spring integration configures single {@link SentryUserProvider} - {@link diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryUserProviderEventProcessor.java b/sentry-spring/src/main/java/io/sentry/spring/SentryUserProviderEventProcessor.java index 687b7b768..2e5370926 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryUserProviderEventProcessor.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryUserProviderEventProcessor.java @@ -1,9 +1,9 @@ package io.sentry.spring; -import io.sentry.core.EventProcessor; -import io.sentry.core.SentryEvent; -import io.sentry.core.protocol.User; -import io.sentry.core.util.Objects; +import io.sentry.EventProcessor; +import io.sentry.SentryEvent; +import io.sentry.protocol.User; +import io.sentry.util.Objects; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryWebConfiguration.java b/sentry-spring/src/main/java/io/sentry/spring/SentryWebConfiguration.java index 902f6b449..86aaf6657 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryWebConfiguration.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryWebConfiguration.java @@ -1,8 +1,8 @@ package io.sentry.spring; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.IHub; -import io.sentry.core.SentryOptions; +import io.sentry.IHub; +import io.sentry.SentryOptions; import org.jetbrains.annotations.NotNull; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt index 1255f96a9..df7e8a5f0 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/EnableSentryTest.kt @@ -1,7 +1,7 @@ package io.sentry.spring -import io.sentry.core.IHub -import io.sentry.core.SentryOptions +import io.sentry.IHub +import io.sentry.SentryOptions import kotlin.test.Test import org.assertj.core.api.Assertions.assertThat import org.springframework.boot.context.annotation.UserConfigurations diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/HttpServletRequestSentryUserProviderTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/HttpServletRequestSentryUserProviderTest.kt index aa9c1529f..20b2617cd 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/HttpServletRequestSentryUserProviderTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/HttpServletRequestSentryUserProviderTest.kt @@ -2,7 +2,7 @@ package io.sentry.spring import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.SentryOptions +import io.sentry.SentryOptions import java.security.Principal import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt index ca33e331d..ed4bcbf8f 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt @@ -1,7 +1,7 @@ package io.sentry.spring -import io.sentry.core.SentryEvent -import io.sentry.core.SentryOptions +import io.sentry.SentryEvent +import io.sentry.SentryOptions import java.net.URI import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/SentrySpringIntegrationTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/SentrySpringIntegrationTest.kt index 6ac380819..40d726c81 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/SentrySpringIntegrationTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/SentrySpringIntegrationTest.kt @@ -3,9 +3,9 @@ package io.sentry.spring import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.reset import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Sentry -import io.sentry.core.transport.ITransport +import io.sentry.Sentry import io.sentry.test.checkEvent +import io.sentry.transport.ITransport import java.lang.RuntimeException import org.assertj.core.api.Assertions.assertThat import org.awaitility.kotlin.await diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorIntegrationTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorIntegrationTest.kt index 8de2d92eb..6cfd87a35 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorIntegrationTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorIntegrationTest.kt @@ -3,12 +3,12 @@ package io.sentry.spring import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.reset import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.Sentry -import io.sentry.core.SentryEvent -import io.sentry.core.SentryOptions -import io.sentry.core.protocol.User -import io.sentry.core.transport.ITransport +import io.sentry.Sentry +import io.sentry.SentryEvent +import io.sentry.SentryOptions +import io.sentry.protocol.User import io.sentry.test.checkEvent +import io.sentry.transport.ITransport import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorTest.kt index 8f0d4ae84..5694f52ab 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryUserProviderEventProcessorTest.kt @@ -1,7 +1,7 @@ package io.sentry.spring -import io.sentry.core.SentryEvent -import io.sentry.core.protocol.User +import io.sentry.SentryEvent +import io.sentry.protocol.User import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index fefac4ef7..a2821878e 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -16,7 +16,7 @@ tasks.withType().configureEach } dependencies { - api(project(":sentry-core")) + api(project(":sentry")) // Envelopes require JSON. Until a parse is done without GSON, we'll depend on it explicitly here implementation(Config.Libs.gson) diff --git a/sentry-test-support/src/main/kotlin/io/sentry/test/assertions.kt b/sentry-test-support/src/main/kotlin/io/sentry/test/assertions.kt index a1d02db8a..4b8ca5971 100644 --- a/sentry-test-support/src/main/kotlin/io/sentry/test/assertions.kt +++ b/sentry-test-support/src/main/kotlin/io/sentry/test/assertions.kt @@ -1,11 +1,11 @@ package io.sentry.test import com.nhaarman.mockitokotlin2.check -import io.sentry.core.GsonSerializer -import io.sentry.core.NoOpLogger -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryEvent -import io.sentry.core.SentryOptions +import io.sentry.GsonSerializer +import io.sentry.NoOpLogger +import io.sentry.SentryEnvelope +import io.sentry.SentryEvent +import io.sentry.SentryOptions /** * Verifies is [SentryEnvelope] contains first event matching a predicate. diff --git a/sentry-core/build.gradle.kts b/sentry/build.gradle.kts similarity index 98% rename from sentry-core/build.gradle.kts rename to sentry/build.gradle.kts index 095269f99..3dd509f5b 100644 --- a/sentry-core/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -68,7 +68,7 @@ tasks { buildConfig { useJavaOutput() - packageName("io.sentry.core") + packageName("io.sentry") buildConfigField("String", "SENTRY_JAVA_SDK_NAME", "\"${Config.Sentry.SENTRY_JAVA_SDK_NAME}\"") buildConfigField("String", "VERSION_NAME", "\"${project.version}\"") } diff --git a/sentry-core/src/main/java/io/sentry/core/AsyncConnectionFactory.java b/sentry/src/main/java/io/sentry/AsyncConnectionFactory.java similarity index 81% rename from sentry-core/src/main/java/io/sentry/core/AsyncConnectionFactory.java rename to sentry/src/main/java/io/sentry/AsyncConnectionFactory.java index 6d51298e5..663a4f0a0 100644 --- a/sentry-core/src/main/java/io/sentry/core/AsyncConnectionFactory.java +++ b/sentry/src/main/java/io/sentry/AsyncConnectionFactory.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.cache.IEnvelopeCache; -import io.sentry.core.transport.AsyncConnection; +import io.sentry.cache.IEnvelopeCache; +import io.sentry.transport.AsyncConnection; final class AsyncConnectionFactory { private AsyncConnectionFactory() {} diff --git a/sentry-core/src/main/java/io/sentry/core/Breadcrumb.java b/sentry/src/main/java/io/sentry/Breadcrumb.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/Breadcrumb.java rename to sentry/src/main/java/io/sentry/Breadcrumb.java index d990e4daf..b428dd650 100644 --- a/sentry-core/src/main/java/io/sentry/core/Breadcrumb.java +++ b/sentry/src/main/java/io/sentry/Breadcrumb.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.CollectionUtils; +import io.sentry.util.CollectionUtils; import java.util.Date; import java.util.Locale; import java.util.Map; diff --git a/sentry-core/src/main/java/io/sentry/core/CircularFifoQueue.java b/sentry/src/main/java/io/sentry/CircularFifoQueue.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/CircularFifoQueue.java rename to sentry/src/main/java/io/sentry/CircularFifoQueue.java index 46ae914f3..60a1df35a 100644 --- a/sentry-core/src/main/java/io/sentry/core/CircularFifoQueue.java +++ b/sentry/src/main/java/io/sentry/CircularFifoQueue.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/CredentialsSettingConfigurator.java b/sentry/src/main/java/io/sentry/CredentialsSettingConfigurator.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/CredentialsSettingConfigurator.java rename to sentry/src/main/java/io/sentry/CredentialsSettingConfigurator.java index 2d244c057..32b9faf33 100644 --- a/sentry-core/src/main/java/io/sentry/core/CredentialsSettingConfigurator.java +++ b/sentry/src/main/java/io/sentry/CredentialsSettingConfigurator.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.transport.IConnectionConfigurator; +import io.sentry.transport.IConnectionConfigurator; import java.net.HttpURLConnection; /** diff --git a/sentry-core/src/main/java/io/sentry/core/DateUtils.java b/sentry/src/main/java/io/sentry/DateUtils.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/DateUtils.java rename to sentry/src/main/java/io/sentry/DateUtils.java index 2110ea896..7670c8b01 100644 --- a/sentry-core/src/main/java/io/sentry/core/DateUtils.java +++ b/sentry/src/main/java/io/sentry/DateUtils.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.text.DateFormat; import java.text.ParseException; diff --git a/sentry-core/src/main/java/io/sentry/core/DiagnosticLogger.java b/sentry/src/main/java/io/sentry/DiagnosticLogger.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/DiagnosticLogger.java rename to sentry/src/main/java/io/sentry/DiagnosticLogger.java index 327e7bd00..c48f79d95 100644 --- a/sentry-core/src/main/java/io/sentry/core/DiagnosticLogger.java +++ b/sentry/src/main/java/io/sentry/DiagnosticLogger.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/DirectoryProcessor.java b/sentry/src/main/java/io/sentry/DirectoryProcessor.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/DirectoryProcessor.java rename to sentry/src/main/java/io/sentry/DirectoryProcessor.java index b5edc27c7..cdd47b3f5 100644 --- a/sentry-core/src/main/java/io/sentry/core/DirectoryProcessor.java +++ b/sentry/src/main/java/io/sentry/DirectoryProcessor.java @@ -1,11 +1,11 @@ -package io.sentry.core; +package io.sentry; -import static io.sentry.core.SentryLevel.ERROR; +import static io.sentry.SentryLevel.ERROR; -import io.sentry.core.hints.Cached; -import io.sentry.core.hints.Flushable; -import io.sentry.core.hints.Retryable; -import io.sentry.core.hints.SubmissionResult; +import io.sentry.hints.Cached; +import io.sentry.hints.Flushable; +import io.sentry.hints.Retryable; +import io.sentry.hints.SubmissionResult; import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/sentry-core/src/main/java/io/sentry/core/Dsn.java b/sentry/src/main/java/io/sentry/Dsn.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/Dsn.java rename to sentry/src/main/java/io/sentry/Dsn.java index d686a83a0..1fc0d15a3 100644 --- a/sentry-core/src/main/java/io/sentry/core/Dsn.java +++ b/sentry/src/main/java/io/sentry/Dsn.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.net.URI; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/DuplicateEventDetectionEventProcessor.java b/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/DuplicateEventDetectionEventProcessor.java rename to sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java index e62824128..686ccbf45 100644 --- a/sentry-core/src/main/java/io/sentry/core/DuplicateEventDetectionEventProcessor.java +++ b/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.exception.ExceptionMechanismException; -import io.sentry.core.util.Objects; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.util.Objects; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/sentry-core/src/main/java/io/sentry/core/EnvelopeReader.java b/sentry/src/main/java/io/sentry/EnvelopeReader.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/EnvelopeReader.java rename to sentry/src/main/java/io/sentry/EnvelopeReader.java index 5ffec841c..6ec6d6059 100644 --- a/sentry-core/src/main/java/io/sentry/core/EnvelopeReader.java +++ b/sentry/src/main/java/io/sentry/EnvelopeReader.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/sentry-core/src/main/java/io/sentry/core/EnvelopeSender.java b/sentry/src/main/java/io/sentry/EnvelopeSender.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/EnvelopeSender.java rename to sentry/src/main/java/io/sentry/EnvelopeSender.java index 2c10965ce..26b4ab771 100644 --- a/sentry-core/src/main/java/io/sentry/core/EnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/EnvelopeSender.java @@ -1,10 +1,10 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.cache.EnvelopeCache; -import io.sentry.core.hints.Flushable; -import io.sentry.core.hints.Retryable; -import io.sentry.core.util.LogUtils; -import io.sentry.core.util.Objects; +import io.sentry.cache.EnvelopeCache; +import io.sentry.hints.Flushable; +import io.sentry.hints.Retryable; +import io.sentry.util.LogUtils; +import io.sentry.util.Objects; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/EventProcessor.java b/sentry/src/main/java/io/sentry/EventProcessor.java similarity index 86% rename from sentry-core/src/main/java/io/sentry/core/EventProcessor.java rename to sentry/src/main/java/io/sentry/EventProcessor.java index 9e225ed63..107cbd715 100644 --- a/sentry-core/src/main/java/io/sentry/core/EventProcessor.java +++ b/sentry/src/main/java/io/sentry/EventProcessor.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/GsonSerializer.java b/sentry/src/main/java/io/sentry/GsonSerializer.java similarity index 88% rename from sentry-core/src/main/java/io/sentry/core/GsonSerializer.java rename to sentry/src/main/java/io/sentry/GsonSerializer.java index 4d44fa523..3a2ec985e 100644 --- a/sentry-core/src/main/java/io/sentry/core/GsonSerializer.java +++ b/sentry/src/main/java/io/sentry/GsonSerializer.java @@ -1,24 +1,24 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.sentry.core.adapters.ContextsDeserializerAdapter; -import io.sentry.core.adapters.ContextsSerializerAdapter; -import io.sentry.core.adapters.DateDeserializerAdapter; -import io.sentry.core.adapters.DateSerializerAdapter; -import io.sentry.core.adapters.OrientationDeserializerAdapter; -import io.sentry.core.adapters.OrientationSerializerAdapter; -import io.sentry.core.adapters.SentryIdDeserializerAdapter; -import io.sentry.core.adapters.SentryIdSerializerAdapter; -import io.sentry.core.adapters.SentryLevelDeserializerAdapter; -import io.sentry.core.adapters.SentryLevelSerializerAdapter; -import io.sentry.core.adapters.TimeZoneDeserializerAdapter; -import io.sentry.core.adapters.TimeZoneSerializerAdapter; -import io.sentry.core.protocol.Contexts; -import io.sentry.core.protocol.Device; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.util.Objects; +import io.sentry.adapters.ContextsDeserializerAdapter; +import io.sentry.adapters.ContextsSerializerAdapter; +import io.sentry.adapters.DateDeserializerAdapter; +import io.sentry.adapters.DateSerializerAdapter; +import io.sentry.adapters.OrientationDeserializerAdapter; +import io.sentry.adapters.OrientationSerializerAdapter; +import io.sentry.adapters.SentryIdDeserializerAdapter; +import io.sentry.adapters.SentryIdSerializerAdapter; +import io.sentry.adapters.SentryLevelDeserializerAdapter; +import io.sentry.adapters.SentryLevelSerializerAdapter; +import io.sentry.adapters.TimeZoneDeserializerAdapter; +import io.sentry.adapters.TimeZoneSerializerAdapter; +import io.sentry.protocol.Contexts; +import io.sentry.protocol.Device; +import io.sentry.protocol.SentryId; +import io.sentry.util.Objects; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/sentry-core/src/main/java/io/sentry/core/HttpTransportFactory.java b/sentry/src/main/java/io/sentry/HttpTransportFactory.java similarity index 83% rename from sentry-core/src/main/java/io/sentry/core/HttpTransportFactory.java rename to sentry/src/main/java/io/sentry/HttpTransportFactory.java index 29a457c0e..7f902498e 100644 --- a/sentry-core/src/main/java/io/sentry/core/HttpTransportFactory.java +++ b/sentry/src/main/java/io/sentry/HttpTransportFactory.java @@ -1,8 +1,8 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.transport.HttpTransport; -import io.sentry.core.transport.IConnectionConfigurator; -import io.sentry.core.transport.ITransport; +import io.sentry.transport.HttpTransport; +import io.sentry.transport.IConnectionConfigurator; +import io.sentry.transport.ITransport; import java.net.MalformedURLException; import java.net.URL; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/Hub.java b/sentry/src/main/java/io/sentry/Hub.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/Hub.java rename to sentry/src/main/java/io/sentry/Hub.java index 44421fdaa..69d4c112a 100644 --- a/sentry-core/src/main/java/io/sentry/core/Hub.java +++ b/sentry/src/main/java/io/sentry/Hub.java @@ -1,10 +1,10 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.hints.SessionEndHint; -import io.sentry.core.hints.SessionStartHint; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.User; -import io.sentry.core.util.Objects; +import io.sentry.hints.SessionEndHint; +import io.sentry.hints.SessionStartHint; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; +import io.sentry.util.Objects; import java.io.Closeable; import java.util.Deque; import java.util.List; diff --git a/sentry-core/src/main/java/io/sentry/core/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/HubAdapter.java rename to sentry/src/main/java/io/sentry/HubAdapter.java index 6bf16abc3..ed4c0b474 100644 --- a/sentry-core/src/main/java/io/sentry/core/HubAdapter.java +++ b/sentry/src/main/java/io/sentry/HubAdapter.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.User; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; import java.util.List; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/IEnvelopeReader.java b/sentry/src/main/java/io/sentry/IEnvelopeReader.java similarity index 91% rename from sentry-core/src/main/java/io/sentry/core/IEnvelopeReader.java rename to sentry/src/main/java/io/sentry/IEnvelopeReader.java index d97f6fbd6..145b63729 100644 --- a/sentry-core/src/main/java/io/sentry/core/IEnvelopeReader.java +++ b/sentry/src/main/java/io/sentry/IEnvelopeReader.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.IOException; import java.io.InputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/IEnvelopeSender.java b/sentry/src/main/java/io/sentry/IEnvelopeSender.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/IEnvelopeSender.java rename to sentry/src/main/java/io/sentry/IEnvelopeSender.java index 5af52c195..2e203e039 100644 --- a/sentry-core/src/main/java/io/sentry/core/IEnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/IEnvelopeSender.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/IHub.java b/sentry/src/main/java/io/sentry/IHub.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/IHub.java rename to sentry/src/main/java/io/sentry/IHub.java index 1b71b994b..9f0369d88 100644 --- a/sentry-core/src/main/java/io/sentry/core/IHub.java +++ b/sentry/src/main/java/io/sentry/IHub.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.User; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; import java.util.List; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/ILogger.java b/sentry/src/main/java/io/sentry/ILogger.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/ILogger.java rename to sentry/src/main/java/io/sentry/ILogger.java index 08e8e4a2f..09804e81a 100644 --- a/sentry-core/src/main/java/io/sentry/core/ILogger.java +++ b/sentry/src/main/java/io/sentry/ILogger.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; /** Sentry SDK internal logging interface. */ public interface ILogger { diff --git a/sentry-core/src/main/java/io/sentry/core/ISentryClient.java b/sentry/src/main/java/io/sentry/ISentryClient.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/ISentryClient.java rename to sentry/src/main/java/io/sentry/ISentryClient.java index 0fc363fe1..e41efec32 100644 --- a/sentry-core/src/main/java/io/sentry/core/ISentryClient.java +++ b/sentry/src/main/java/io/sentry/ISentryClient.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.Message; -import io.sentry.core.protocol.SentryId; +import io.sentry.protocol.Message; +import io.sentry.protocol.SentryId; import org.jetbrains.annotations.Nullable; /** Sentry Client interface */ diff --git a/sentry-core/src/main/java/io/sentry/core/ISentryExecutorService.java b/sentry/src/main/java/io/sentry/ISentryExecutorService.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/ISentryExecutorService.java rename to sentry/src/main/java/io/sentry/ISentryExecutorService.java index b096ce7b6..1f54c388b 100644 --- a/sentry-core/src/main/java/io/sentry/core/ISentryExecutorService.java +++ b/sentry/src/main/java/io/sentry/ISentryExecutorService.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.util.concurrent.Future; diff --git a/sentry-core/src/main/java/io/sentry/core/ISerializer.java b/sentry/src/main/java/io/sentry/ISerializer.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/ISerializer.java rename to sentry/src/main/java/io/sentry/ISerializer.java index b9664472f..8b8921644 100644 --- a/sentry-core/src/main/java/io/sentry/core/ISerializer.java +++ b/sentry/src/main/java/io/sentry/ISerializer.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.IOException; import java.io.InputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/IUnknownPropertiesConsumer.java b/sentry/src/main/java/io/sentry/IUnknownPropertiesConsumer.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/IUnknownPropertiesConsumer.java rename to sentry/src/main/java/io/sentry/IUnknownPropertiesConsumer.java index f6e31a6df..5da2df302 100644 --- a/sentry-core/src/main/java/io/sentry/core/IUnknownPropertiesConsumer.java +++ b/sentry/src/main/java/io/sentry/IUnknownPropertiesConsumer.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/Integration.java b/sentry/src/main/java/io/sentry/Integration.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/Integration.java rename to sentry/src/main/java/io/sentry/Integration.java index 1f80bdd20..346528671 100644 --- a/sentry-core/src/main/java/io/sentry/core/Integration.java +++ b/sentry/src/main/java/io/sentry/Integration.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; /** * Code that provides middlewares, bindings or hooks into certain frameworks or environments, along diff --git a/sentry-core/src/main/java/io/sentry/core/InvalidDsnException.java b/sentry/src/main/java/io/sentry/InvalidDsnException.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/InvalidDsnException.java rename to sentry/src/main/java/io/sentry/InvalidDsnException.java index 7c4e4966f..8ff38297a 100644 --- a/sentry-core/src/main/java/io/sentry/core/InvalidDsnException.java +++ b/sentry/src/main/java/io/sentry/InvalidDsnException.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; public final class InvalidDsnException extends RuntimeException { private static final long serialVersionUID = 412945154259913013L; diff --git a/sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java b/sentry/src/main/java/io/sentry/MainEventProcessor.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java rename to sentry/src/main/java/io/sentry/MainEventProcessor.java index ea0b23a73..a1a822698 100644 --- a/sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java +++ b/sentry/src/main/java/io/sentry/MainEventProcessor.java @@ -1,8 +1,8 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryException; -import io.sentry.core.util.ApplyScopeUtils; -import io.sentry.core.util.Objects; +import io.sentry.protocol.SentryException; +import io.sentry.util.ApplyScopeUtils; +import io.sentry.util.Objects; import java.util.ArrayList; import java.util.List; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/NoOpEnvelopeReader.java b/sentry/src/main/java/io/sentry/NoOpEnvelopeReader.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/NoOpEnvelopeReader.java rename to sentry/src/main/java/io/sentry/NoOpEnvelopeReader.java index 208cbc438..f06533c32 100644 --- a/sentry-core/src/main/java/io/sentry/core/NoOpEnvelopeReader.java +++ b/sentry/src/main/java/io/sentry/NoOpEnvelopeReader.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.IOException; import java.io.InputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/NoOpHub.java rename to sentry/src/main/java/io/sentry/NoOpHub.java index fb2b14bb0..8319ff554 100644 --- a/sentry-core/src/main/java/io/sentry/core/NoOpHub.java +++ b/sentry/src/main/java/io/sentry/NoOpHub.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.User; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; import java.util.List; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/NoOpLogger.java b/sentry/src/main/java/io/sentry/NoOpLogger.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/NoOpLogger.java rename to sentry/src/main/java/io/sentry/NoOpLogger.java index d7aaf3a8c..32fc35a85 100644 --- a/sentry-core/src/main/java/io/sentry/core/NoOpLogger.java +++ b/sentry/src/main/java/io/sentry/NoOpLogger.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; /** No-op implementation of ILogger */ public final class NoOpLogger implements ILogger { diff --git a/sentry-core/src/main/java/io/sentry/core/NoOpSentryClient.java b/sentry/src/main/java/io/sentry/NoOpSentryClient.java similarity index 92% rename from sentry-core/src/main/java/io/sentry/core/NoOpSentryClient.java rename to sentry/src/main/java/io/sentry/NoOpSentryClient.java index 69e7f3bb4..65c6256d7 100644 --- a/sentry-core/src/main/java/io/sentry/core/NoOpSentryClient.java +++ b/sentry/src/main/java/io/sentry/NoOpSentryClient.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryId; +import io.sentry.protocol.SentryId; import org.jetbrains.annotations.Nullable; final class NoOpSentryClient implements ISentryClient { diff --git a/sentry-core/src/main/java/io/sentry/core/NoOpSerializer.java b/sentry/src/main/java/io/sentry/NoOpSerializer.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/NoOpSerializer.java rename to sentry/src/main/java/io/sentry/NoOpSerializer.java index ab988299f..f4047d47c 100644 --- a/sentry-core/src/main/java/io/sentry/core/NoOpSerializer.java +++ b/sentry/src/main/java/io/sentry/NoOpSerializer.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.IOException; import java.io.InputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/OptionsContainer.java b/sentry/src/main/java/io/sentry/OptionsContainer.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/OptionsContainer.java rename to sentry/src/main/java/io/sentry/OptionsContainer.java index d5c6835f8..a3593c537 100644 --- a/sentry-core/src/main/java/io/sentry/core/OptionsContainer.java +++ b/sentry/src/main/java/io/sentry/OptionsContainer.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.lang.reflect.InvocationTargetException; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/OutboxSender.java b/sentry/src/main/java/io/sentry/OutboxSender.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/OutboxSender.java rename to sentry/src/main/java/io/sentry/OutboxSender.java index 3d466e409..55c5b2104 100644 --- a/sentry-core/src/main/java/io/sentry/core/OutboxSender.java +++ b/sentry/src/main/java/io/sentry/OutboxSender.java @@ -1,14 +1,14 @@ -package io.sentry.core; +package io.sentry; -import static io.sentry.core.SentryLevel.ERROR; -import static io.sentry.core.cache.EnvelopeCache.PREFIX_CURRENT_SESSION_FILE; +import static io.sentry.SentryLevel.ERROR; +import static io.sentry.cache.EnvelopeCache.PREFIX_CURRENT_SESSION_FILE; -import io.sentry.core.hints.Flushable; -import io.sentry.core.hints.Retryable; -import io.sentry.core.hints.SubmissionResult; -import io.sentry.core.util.CollectionUtils; -import io.sentry.core.util.LogUtils; -import io.sentry.core.util.Objects; +import io.sentry.hints.Flushable; +import io.sentry.hints.Retryable; +import io.sentry.hints.SubmissionResult; +import io.sentry.util.CollectionUtils; +import io.sentry.util.LogUtils; +import io.sentry.util.Objects; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/Scope.java b/sentry/src/main/java/io/sentry/Scope.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/Scope.java rename to sentry/src/main/java/io/sentry/Scope.java index ec54ab860..4bea21754 100644 --- a/sentry-core/src/main/java/io/sentry/core/Scope.java +++ b/sentry/src/main/java/io/sentry/Scope.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.Contexts; -import io.sentry.core.protocol.User; +import io.sentry.protocol.Contexts; +import io.sentry.protocol.User; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/sentry-core/src/main/java/io/sentry/core/ScopeCallback.java b/sentry/src/main/java/io/sentry/ScopeCallback.java similarity index 71% rename from sentry-core/src/main/java/io/sentry/core/ScopeCallback.java rename to sentry/src/main/java/io/sentry/ScopeCallback.java index 90d2e51f2..a20632c46 100644 --- a/sentry-core/src/main/java/io/sentry/core/ScopeCallback.java +++ b/sentry/src/main/java/io/sentry/ScopeCallback.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; public interface ScopeCallback { void run(Scope scope); diff --git a/sentry-core/src/main/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegration.java b/sentry/src/main/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegration.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegration.java rename to sentry/src/main/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegration.java index 8200be48d..9ecef1a77 100644 --- a/sentry-core/src/main/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegration.java +++ b/sentry/src/main/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegration.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.io.File; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/SendFireAndForgetEnvelopeSender.java b/sentry/src/main/java/io/sentry/SendFireAndForgetEnvelopeSender.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/SendFireAndForgetEnvelopeSender.java rename to sentry/src/main/java/io/sentry/SendFireAndForgetEnvelopeSender.java index 172fe51f2..1e90cabc1 100644 --- a/sentry-core/src/main/java/io/sentry/core/SendFireAndForgetEnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/SendFireAndForgetEnvelopeSender.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/SendFireAndForgetOutboxSender.java b/sentry/src/main/java/io/sentry/SendFireAndForgetOutboxSender.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/SendFireAndForgetOutboxSender.java rename to sentry/src/main/java/io/sentry/SendFireAndForgetOutboxSender.java index a56b1a7da..766b9fa4e 100644 --- a/sentry-core/src/main/java/io/sentry/core/SendFireAndForgetOutboxSender.java +++ b/sentry/src/main/java/io/sentry/SendFireAndForgetOutboxSender.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/Sentry.java rename to sentry/src/main/java/io/sentry/Sentry.java index 05c2664cd..36c8a684f 100644 --- a/sentry-core/src/main/java/io/sentry/core/Sentry.java +++ b/sentry/src/main/java/io/sentry/Sentry.java @@ -1,8 +1,8 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.cache.EnvelopeCache; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.User; +import io.sentry.cache.EnvelopeCache; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; import java.io.File; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryClient.java b/sentry/src/main/java/io/sentry/SentryClient.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/SentryClient.java rename to sentry/src/main/java/io/sentry/SentryClient.java index 7f00fa580..2dee70f8f 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryClient.java +++ b/sentry/src/main/java/io/sentry/SentryClient.java @@ -1,12 +1,12 @@ -package io.sentry.core; - -import io.sentry.core.hints.DiskFlushNotification; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.transport.Connection; -import io.sentry.core.transport.ITransport; -import io.sentry.core.transport.NoOpTransport; -import io.sentry.core.util.ApplyScopeUtils; -import io.sentry.core.util.Objects; +package io.sentry; + +import io.sentry.hints.DiskFlushNotification; +import io.sentry.protocol.SentryId; +import io.sentry.transport.Connection; +import io.sentry.transport.ITransport; +import io.sentry.transport.NoOpTransport; +import io.sentry.util.ApplyScopeUtils; +import io.sentry.util.Objects; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelope.java b/sentry/src/main/java/io/sentry/SentryEnvelope.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelope.java rename to sentry/src/main/java/io/sentry/SentryEnvelope.java index 54ceb3a3b..f2a967b72 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelope.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelope.java @@ -1,8 +1,8 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.util.Objects; +import io.sentry.protocol.SdkVersion; +import io.sentry.protocol.SentryId; +import io.sentry.util.Objects; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeader.java b/sentry/src/main/java/io/sentry/SentryEnvelopeHeader.java similarity index 88% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeader.java rename to sentry/src/main/java/io/sentry/SentryEnvelopeHeader.java index 03a6e14a1..6c8dc80bb 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeader.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeHeader.java @@ -1,7 +1,7 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.protocol.SentryId; +import io.sentry.protocol.SdkVersion; +import io.sentry.protocol.SentryId; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeaderAdapter.java b/sentry/src/main/java/io/sentry/SentryEnvelopeHeaderAdapter.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeaderAdapter.java rename to sentry/src/main/java/io/sentry/SentryEnvelopeHeaderAdapter.java index 386098bb7..e0266bb8e 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeHeaderAdapter.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeHeaderAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.protocol.SentryId; -import io.sentry.core.protocol.SentryPackage; +import io.sentry.protocol.SdkVersion; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.SentryPackage; import java.io.IOException; import java.util.List; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItem.java b/sentry/src/main/java/io/sentry/SentryEnvelopeItem.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItem.java rename to sentry/src/main/java/io/sentry/SentryEnvelopeItem.java index 46cf879d5..7e71d6552 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItem.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeItem.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeader.java b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeader.java rename to sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java index caa2bea77..2e39b3520 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeader.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeader.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import java.util.concurrent.Callable; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeaderAdapter.java b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeaderAdapter.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeaderAdapter.java rename to sentry/src/main/java/io/sentry/SentryEnvelopeItemHeaderAdapter.java index 8a161e54d..ee3f9030d 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEnvelopeItemHeaderAdapter.java +++ b/sentry/src/main/java/io/sentry/SentryEnvelopeItemHeaderAdapter.java @@ -1,10 +1,10 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import io.sentry.core.util.StringUtils; +import io.sentry.util.StringUtils; import java.io.IOException; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryEvent.java b/sentry/src/main/java/io/sentry/SentryEvent.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/SentryEvent.java rename to sentry/src/main/java/io/sentry/SentryEvent.java index 854d68c47..1bd1b1a44 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryEvent.java +++ b/sentry/src/main/java/io/sentry/SentryEvent.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.*; +import io.sentry.protocol.*; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryExceptionFactory.java b/sentry/src/main/java/io/sentry/SentryExceptionFactory.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/SentryExceptionFactory.java rename to sentry/src/main/java/io/sentry/SentryExceptionFactory.java index ffc5db043..df6d6cf34 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryExceptionFactory.java +++ b/sentry/src/main/java/io/sentry/SentryExceptionFactory.java @@ -1,10 +1,10 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.exception.ExceptionMechanismException; -import io.sentry.core.protocol.Mechanism; -import io.sentry.core.protocol.SentryException; -import io.sentry.core.protocol.SentryStackTrace; -import io.sentry.core.util.Objects; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.protocol.Mechanism; +import io.sentry.protocol.SentryException; +import io.sentry.protocol.SentryStackTrace; +import io.sentry.util.Objects; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryExecutorService.java b/sentry/src/main/java/io/sentry/SentryExecutorService.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SentryExecutorService.java rename to sentry/src/main/java/io/sentry/SentryExecutorService.java index 9df4773d5..d115988d8 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryExecutorService.java +++ b/sentry/src/main/java/io/sentry/SentryExecutorService.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryItemType.java b/sentry/src/main/java/io/sentry/SentryItemType.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/SentryItemType.java rename to sentry/src/main/java/io/sentry/SentryItemType.java index 145bdc264..3ad9b3afb 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryItemType.java +++ b/sentry/src/main/java/io/sentry/SentryItemType.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryLevel.java b/sentry/src/main/java/io/sentry/SentryLevel.java similarity index 87% rename from sentry-core/src/main/java/io/sentry/core/SentryLevel.java rename to sentry/src/main/java/io/sentry/SentryLevel.java index 244f2331c..e1a6c2dbf 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryLevel.java +++ b/sentry/src/main/java/io/sentry/SentryLevel.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; /** the SentryLevel */ public enum SentryLevel { diff --git a/sentry-core/src/main/java/io/sentry/core/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SentryOptions.java rename to sentry/src/main/java/io/sentry/SentryOptions.java index 73bad4341..5569311fa 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryOptions.java +++ b/sentry/src/main/java/io/sentry/SentryOptions.java @@ -1,13 +1,13 @@ -package io.sentry.core; +package io.sentry; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.cache.IEnvelopeCache; -import io.sentry.core.protocol.SdkVersion; -import io.sentry.core.transport.ITransport; -import io.sentry.core.transport.ITransportGate; -import io.sentry.core.transport.NoOpEnvelopeCache; -import io.sentry.core.transport.NoOpTransport; -import io.sentry.core.transport.NoOpTransportGate; +import io.sentry.cache.IEnvelopeCache; +import io.sentry.protocol.SdkVersion; +import io.sentry.transport.ITransport; +import io.sentry.transport.ITransportGate; +import io.sentry.transport.NoOpEnvelopeCache; +import io.sentry.transport.NoOpTransport; +import io.sentry.transport.NoOpTransportGate; import java.io.File; import java.net.Proxy; import java.util.List; @@ -1003,7 +1003,7 @@ public SentryOptions() { sdkVersion.setName(BuildConfig.SENTRY_JAVA_SDK_NAME); String version = BuildConfig.VERSION_NAME; sdkVersion.setVersion(version); - sdkVersion.addPackage("maven:sentry-core", version); + sdkVersion.addPackage("maven:sentry", version); return sdkVersion; } diff --git a/sentry-core/src/main/java/io/sentry/core/SentryStackTraceFactory.java b/sentry/src/main/java/io/sentry/SentryStackTraceFactory.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/SentryStackTraceFactory.java rename to sentry/src/main/java/io/sentry/SentryStackTraceFactory.java index 62e3d5419..10fe8d2fe 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryStackTraceFactory.java +++ b/sentry/src/main/java/io/sentry/SentryStackTraceFactory.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryStackFrame; +import io.sentry.protocol.SentryStackFrame; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryThreadFactory.java b/sentry/src/main/java/io/sentry/SentryThreadFactory.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/SentryThreadFactory.java rename to sentry/src/main/java/io/sentry/SentryThreadFactory.java index fe2b223f8..ec6ce0dc1 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryThreadFactory.java +++ b/sentry/src/main/java/io/sentry/SentryThreadFactory.java @@ -1,9 +1,9 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.SentryStackFrame; -import io.sentry.core.protocol.SentryStackTrace; -import io.sentry.core.protocol.SentryThread; -import io.sentry.core.util.Objects; +import io.sentry.protocol.SentryStackFrame; +import io.sentry.protocol.SentryStackTrace; +import io.sentry.protocol.SentryThread; +import io.sentry.util.Objects; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/sentry-core/src/main/java/io/sentry/core/SentryValues.java b/sentry/src/main/java/io/sentry/SentryValues.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/SentryValues.java rename to sentry/src/main/java/io/sentry/SentryValues.java index ced625df1..ecf32e72e 100644 --- a/sentry-core/src/main/java/io/sentry/core/SentryValues.java +++ b/sentry/src/main/java/io/sentry/SentryValues.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.util.ArrayList; import java.util.List; diff --git a/sentry-core/src/main/java/io/sentry/core/Session.java b/sentry/src/main/java/io/sentry/Session.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/Session.java rename to sentry/src/main/java/io/sentry/Session.java index c5dd5a08a..999ba4e20 100644 --- a/sentry-core/src/main/java/io/sentry/core/Session.java +++ b/sentry/src/main/java/io/sentry/Session.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.protocol.User; +import io.sentry.protocol.User; import java.util.Date; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; diff --git a/sentry-core/src/main/java/io/sentry/core/SessionAdapter.java b/sentry/src/main/java/io/sentry/SessionAdapter.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SessionAdapter.java rename to sentry/src/main/java/io/sentry/SessionAdapter.java index c463fd86a..5480b6493 100644 --- a/sentry-core/src/main/java/io/sentry/core/SessionAdapter.java +++ b/sentry/src/main/java/io/sentry/SessionAdapter.java @@ -1,11 +1,11 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import io.sentry.core.util.Objects; -import io.sentry.core.util.StringUtils; +import io.sentry.util.Objects; +import io.sentry.util.StringUtils; import java.io.IOException; import java.util.Date; import java.util.Locale; diff --git a/sentry-core/src/main/java/io/sentry/core/ShutdownHookIntegration.java b/sentry/src/main/java/io/sentry/ShutdownHookIntegration.java similarity index 92% rename from sentry-core/src/main/java/io/sentry/core/ShutdownHookIntegration.java rename to sentry/src/main/java/io/sentry/ShutdownHookIntegration.java index b30149ba9..cc76d7b47 100644 --- a/sentry-core/src/main/java/io/sentry/core/ShutdownHookIntegration.java +++ b/sentry/src/main/java/io/sentry/ShutdownHookIntegration.java @@ -1,6 +1,6 @@ -package io.sentry.core; +package io.sentry; -import io.sentry.core.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; diff --git a/sentry-core/src/main/java/io/sentry/core/SynchronizedCollection.java b/sentry/src/main/java/io/sentry/SynchronizedCollection.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/SynchronizedCollection.java rename to sentry/src/main/java/io/sentry/SynchronizedCollection.java index 84d5ba18f..3d430952e 100644 --- a/sentry-core/src/main/java/io/sentry/core/SynchronizedCollection.java +++ b/sentry/src/main/java/io/sentry/SynchronizedCollection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.sentry.core; +package io.sentry; import com.jakewharton.nopen.annotation.Open; import java.io.Serializable; diff --git a/sentry-core/src/main/java/io/sentry/core/SynchronizedQueue.java b/sentry/src/main/java/io/sentry/SynchronizedQueue.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/SynchronizedQueue.java rename to sentry/src/main/java/io/sentry/SynchronizedQueue.java index 015e35066..6236f052d 100644 --- a/sentry-core/src/main/java/io/sentry/core/SynchronizedQueue.java +++ b/sentry/src/main/java/io/sentry/SynchronizedQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.sentry.core; +package io.sentry; import java.util.Queue; diff --git a/sentry-core/src/main/java/io/sentry/core/SystemOutLogger.java b/sentry/src/main/java/io/sentry/SystemOutLogger.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/SystemOutLogger.java rename to sentry/src/main/java/io/sentry/SystemOutLogger.java index 20f7ce810..90aef4244 100644 --- a/sentry-core/src/main/java/io/sentry/core/SystemOutLogger.java +++ b/sentry/src/main/java/io/sentry/SystemOutLogger.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandler.java b/sentry/src/main/java/io/sentry/UncaughtExceptionHandler.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandler.java rename to sentry/src/main/java/io/sentry/UncaughtExceptionHandler.java index 4c7dcea07..74457d8d3 100644 --- a/sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandler.java +++ b/sentry/src/main/java/io/sentry/UncaughtExceptionHandler.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; /** An adapter to make UncaughtExceptionHandler testable */ interface UncaughtExceptionHandler { diff --git a/sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandlerIntegration.java b/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandlerIntegration.java rename to sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java index 10ea15646..6ae251254 100644 --- a/sentry-core/src/main/java/io/sentry/core/UncaughtExceptionHandlerIntegration.java +++ b/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java @@ -1,13 +1,13 @@ -package io.sentry.core; +package io.sentry; -import static io.sentry.core.SentryLevel.ERROR; +import static io.sentry.SentryLevel.ERROR; -import io.sentry.core.exception.ExceptionMechanismException; -import io.sentry.core.hints.DiskFlushNotification; -import io.sentry.core.hints.Flushable; -import io.sentry.core.hints.SessionEnd; -import io.sentry.core.protocol.Mechanism; -import io.sentry.core.util.Objects; +import io.sentry.exception.ExceptionMechanismException; +import io.sentry.hints.DiskFlushNotification; +import io.sentry.hints.Flushable; +import io.sentry.hints.SessionEnd; +import io.sentry.protocol.Mechanism; +import io.sentry.util.Objects; import java.io.Closeable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/sentry-core/src/main/java/io/sentry/core/UnknownPropertiesTypeAdapterFactory.java b/sentry/src/main/java/io/sentry/UnknownPropertiesTypeAdapterFactory.java similarity index 99% rename from sentry-core/src/main/java/io/sentry/core/UnknownPropertiesTypeAdapterFactory.java rename to sentry/src/main/java/io/sentry/UnknownPropertiesTypeAdapterFactory.java index 42717f0d1..e9c9c5b5d 100644 --- a/sentry-core/src/main/java/io/sentry/core/UnknownPropertiesTypeAdapterFactory.java +++ b/sentry/src/main/java/io/sentry/UnknownPropertiesTypeAdapterFactory.java @@ -1,4 +1,4 @@ -package io.sentry.core; +package io.sentry; import com.google.gson.FieldNamingStrategy; import com.google.gson.Gson; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/ContextsDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/ContextsDeserializerAdapter.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/adapters/ContextsDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/ContextsDeserializerAdapter.java index eaa86e60d..aaf90d90d 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/ContextsDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/ContextsDeserializerAdapter.java @@ -1,19 +1,19 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.App; -import io.sentry.core.protocol.Browser; -import io.sentry.core.protocol.Contexts; -import io.sentry.core.protocol.Device; -import io.sentry.core.protocol.Gpu; -import io.sentry.core.protocol.OperatingSystem; -import io.sentry.core.protocol.SentryRuntime; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.App; +import io.sentry.protocol.Browser; +import io.sentry.protocol.Contexts; +import io.sentry.protocol.Device; +import io.sentry.protocol.Gpu; +import io.sentry.protocol.OperatingSystem; +import io.sentry.protocol.SentryRuntime; import java.lang.reflect.Type; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/ContextsSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/ContextsSerializerAdapter.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/adapters/ContextsSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/ContextsSerializerAdapter.java index ef96fafd8..834c04915 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/ContextsSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/ContextsSerializerAdapter.java @@ -1,13 +1,13 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.Contexts; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.Contexts; import java.lang.reflect.Type; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/DateDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/DateDeserializerAdapter.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/adapters/DateDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/DateDeserializerAdapter.java index ed0e520d6..d5331f561 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/DateDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/DateDeserializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.sentry.core.DateUtils; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.DateUtils; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.Date; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/DateSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/DateSerializerAdapter.java similarity index 86% rename from sentry-core/src/main/java/io/sentry/core/adapters/DateSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/DateSerializerAdapter.java index 3a7e2ae61..419b57917 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/DateSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/DateSerializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.DateUtils; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.DateUtils; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.Date; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/OrientationDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/OrientationDeserializerAdapter.java similarity index 88% rename from sentry-core/src/main/java/io/sentry/core/adapters/OrientationDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/OrientationDeserializerAdapter.java index 53d3a1d8d..d4fd295ec 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/OrientationDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/OrientationDeserializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.Device; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.Device; import java.lang.reflect.Type; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/OrientationSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/OrientationSerializerAdapter.java similarity index 87% rename from sentry-core/src/main/java/io/sentry/core/adapters/OrientationSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/OrientationSerializerAdapter.java index 9a7c97ed3..4e1ee6c72 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/OrientationSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/OrientationSerializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.Device; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.Device; import java.lang.reflect.Type; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/SentryIdDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/SentryIdDeserializerAdapter.java similarity index 86% rename from sentry-core/src/main/java/io/sentry/core/adapters/SentryIdDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/SentryIdDeserializerAdapter.java index 10c0b77dd..83ed4193b 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/SentryIdDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/SentryIdDeserializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.SentryId; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.SentryId; import java.lang.reflect.Type; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/SentryIdSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/SentryIdSerializerAdapter.java similarity index 85% rename from sentry-core/src/main/java/io/sentry/core/adapters/SentryIdSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/SentryIdSerializerAdapter.java index 251b3ccba..7cf6efab4 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/SentryIdSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/SentryIdSerializerAdapter.java @@ -1,12 +1,12 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; -import io.sentry.core.protocol.SentryId; +import io.sentry.ILogger; +import io.sentry.SentryLevel; +import io.sentry.protocol.SentryId; import java.lang.reflect.Type; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/SentryLevelDeserializerAdapter.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/SentryLevelDeserializerAdapter.java index 8018a64e3..09f109d5b 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/SentryLevelDeserializerAdapter.java @@ -1,11 +1,11 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/SentryLevelSerializerAdapter.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/SentryLevelSerializerAdapter.java index fb5a383a3..911f83015 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/SentryLevelSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/SentryLevelSerializerAdapter.java @@ -1,11 +1,11 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneDeserializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/TimeZoneDeserializerAdapter.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneDeserializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/TimeZoneDeserializerAdapter.java index 6d7ecaeb2..2cd89b4fb 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneDeserializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/TimeZoneDeserializerAdapter.java @@ -1,11 +1,11 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.TimeZone; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneSerializerAdapter.java b/sentry/src/main/java/io/sentry/adapters/TimeZoneSerializerAdapter.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneSerializerAdapter.java rename to sentry/src/main/java/io/sentry/adapters/TimeZoneSerializerAdapter.java index 6e7009d99..4c5356229 100644 --- a/sentry-core/src/main/java/io/sentry/core/adapters/TimeZoneSerializerAdapter.java +++ b/sentry/src/main/java/io/sentry/adapters/TimeZoneSerializerAdapter.java @@ -1,11 +1,11 @@ -package io.sentry.core.adapters; +package io.sentry.adapters; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.lang.reflect.Type; import java.util.TimeZone; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/cache/CacheStrategy.java b/sentry/src/main/java/io/sentry/cache/CacheStrategy.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/cache/CacheStrategy.java rename to sentry/src/main/java/io/sentry/cache/CacheStrategy.java index 61e224e5d..40d36c585 100644 --- a/sentry-core/src/main/java/io/sentry/core/cache/CacheStrategy.java +++ b/sentry/src/main/java/io/sentry/cache/CacheStrategy.java @@ -1,15 +1,15 @@ -package io.sentry.core.cache; - -import static io.sentry.core.SentryLevel.ERROR; - -import io.sentry.core.ISerializer; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.SentryEnvelopeItem; -import io.sentry.core.SentryItemType; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.Session; -import io.sentry.core.util.Objects; +package io.sentry.cache; + +import static io.sentry.SentryLevel.ERROR; + +import io.sentry.ISerializer; +import io.sentry.SentryEnvelope; +import io.sentry.SentryEnvelopeItem; +import io.sentry.SentryItemType; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.Session; +import io.sentry.util.Objects; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/sentry-core/src/main/java/io/sentry/core/cache/EnvelopeCache.java b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/cache/EnvelopeCache.java rename to sentry/src/main/java/io/sentry/cache/EnvelopeCache.java index a66cc6602..347712cb7 100644 --- a/sentry-core/src/main/java/io/sentry/core/cache/EnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java @@ -1,21 +1,21 @@ -package io.sentry.core.cache; +package io.sentry.cache; -import static io.sentry.core.SentryLevel.DEBUG; -import static io.sentry.core.SentryLevel.ERROR; -import static io.sentry.core.SentryLevel.INFO; -import static io.sentry.core.SentryLevel.WARNING; +import static io.sentry.SentryLevel.DEBUG; +import static io.sentry.SentryLevel.ERROR; +import static io.sentry.SentryLevel.INFO; +import static io.sentry.SentryLevel.WARNING; import static java.lang.String.format; -import io.sentry.core.DateUtils; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.SentryEnvelopeItem; -import io.sentry.core.SentryItemType; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.Session; -import io.sentry.core.hints.SessionEnd; -import io.sentry.core.hints.SessionStart; -import io.sentry.core.util.Objects; +import io.sentry.DateUtils; +import io.sentry.SentryEnvelope; +import io.sentry.SentryEnvelopeItem; +import io.sentry.SentryItemType; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.Session; +import io.sentry.hints.SessionEnd; +import io.sentry.hints.SessionStart; +import io.sentry.util.Objects; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/sentry-core/src/main/java/io/sentry/core/cache/IEnvelopeCache.java b/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java similarity index 81% rename from sentry-core/src/main/java/io/sentry/core/cache/IEnvelopeCache.java rename to sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java index eac573080..a674c7f77 100644 --- a/sentry-core/src/main/java/io/sentry/core/cache/IEnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java @@ -1,6 +1,6 @@ -package io.sentry.core.cache; +package io.sentry.cache; -import io.sentry.core.SentryEnvelope; +import io.sentry.SentryEnvelope; import org.jetbrains.annotations.Nullable; public interface IEnvelopeCache extends Iterable { diff --git a/sentry-core/src/main/java/io/sentry/core/exception/ExceptionMechanismException.java b/sentry/src/main/java/io/sentry/exception/ExceptionMechanismException.java similarity index 83% rename from sentry-core/src/main/java/io/sentry/core/exception/ExceptionMechanismException.java rename to sentry/src/main/java/io/sentry/exception/ExceptionMechanismException.java index b7f852232..5d7914c98 100644 --- a/sentry-core/src/main/java/io/sentry/core/exception/ExceptionMechanismException.java +++ b/sentry/src/main/java/io/sentry/exception/ExceptionMechanismException.java @@ -1,12 +1,12 @@ -package io.sentry.core.exception; +package io.sentry.exception; -import io.sentry.core.protocol.Mechanism; +import io.sentry.protocol.Mechanism; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; /** - * A throwable decorator that holds an {@link io.sentry.core.protocol.Mechanism} related to the - * decorated {@link Throwable}. + * A throwable decorator that holds an {@link io.sentry.protocol.Mechanism} related to the decorated + * {@link Throwable}. */ @ApiStatus.Internal public final class ExceptionMechanismException extends RuntimeException { diff --git a/sentry-core/src/main/java/io/sentry/core/hints/ApplyScopeData.java b/sentry/src/main/java/io/sentry/hints/ApplyScopeData.java similarity index 86% rename from sentry-core/src/main/java/io/sentry/core/hints/ApplyScopeData.java rename to sentry/src/main/java/io/sentry/hints/ApplyScopeData.java index c3d4997c1..91da65bd8 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/ApplyScopeData.java +++ b/sentry/src/main/java/io/sentry/hints/ApplyScopeData.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; /** * Marker interface for applying scope's data. This means applying data relevant to the current diff --git a/sentry-core/src/main/java/io/sentry/core/hints/Cached.java b/sentry/src/main/java/io/sentry/hints/Cached.java similarity index 76% rename from sentry-core/src/main/java/io/sentry/core/hints/Cached.java rename to sentry/src/main/java/io/sentry/hints/Cached.java index 100f90695..d3bacd850 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/Cached.java +++ b/sentry/src/main/java/io/sentry/hints/Cached.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; /** Marker interface for a capture involving data cached from disk */ public interface Cached {} diff --git a/sentry-core/src/main/java/io/sentry/core/hints/DiskFlushNotification.java b/sentry/src/main/java/io/sentry/hints/DiskFlushNotification.java similarity index 68% rename from sentry-core/src/main/java/io/sentry/core/hints/DiskFlushNotification.java rename to sentry/src/main/java/io/sentry/hints/DiskFlushNotification.java index 7ade8f018..52d32e850 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/DiskFlushNotification.java +++ b/sentry/src/main/java/io/sentry/hints/DiskFlushNotification.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; public interface DiskFlushNotification { void markFlushed(); diff --git a/sentry-core/src/main/java/io/sentry/core/hints/Flushable.java b/sentry/src/main/java/io/sentry/hints/Flushable.java similarity index 79% rename from sentry-core/src/main/java/io/sentry/core/hints/Flushable.java rename to sentry/src/main/java/io/sentry/hints/Flushable.java index 970bc1df1..f5348dabf 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/Flushable.java +++ b/sentry/src/main/java/io/sentry/hints/Flushable.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; /** marker interface that awaits events to be flushed */ public interface Flushable { diff --git a/sentry-core/src/main/java/io/sentry/core/hints/Retryable.java b/sentry/src/main/java/io/sentry/hints/Retryable.java similarity index 74% rename from sentry-core/src/main/java/io/sentry/core/hints/Retryable.java rename to sentry/src/main/java/io/sentry/hints/Retryable.java index c9a57ea20..51bf85d33 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/Retryable.java +++ b/sentry/src/main/java/io/sentry/hints/Retryable.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; public interface Retryable { boolean isRetry(); diff --git a/sentry-core/src/main/java/io/sentry/core/hints/SessionEnd.java b/sentry/src/main/java/io/sentry/hints/SessionEnd.java similarity index 74% rename from sentry-core/src/main/java/io/sentry/core/hints/SessionEnd.java rename to sentry/src/main/java/io/sentry/hints/SessionEnd.java index 84ea9a7b8..59d7f120e 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/SessionEnd.java +++ b/sentry/src/main/java/io/sentry/hints/SessionEnd.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; /** Hint that shows this is a session end envelope */ public interface SessionEnd {} diff --git a/sentry-core/src/main/java/io/sentry/core/hints/SessionEndHint.java b/sentry/src/main/java/io/sentry/hints/SessionEndHint.java similarity index 66% rename from sentry-core/src/main/java/io/sentry/core/hints/SessionEndHint.java rename to sentry/src/main/java/io/sentry/hints/SessionEndHint.java index fdccfe95e..c083560da 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/SessionEndHint.java +++ b/sentry/src/main/java/io/sentry/hints/SessionEndHint.java @@ -1,3 +1,3 @@ -package io.sentry.core.hints; +package io.sentry.hints; public final class SessionEndHint implements SessionEnd {} diff --git a/sentry-core/src/main/java/io/sentry/core/hints/SessionStart.java b/sentry/src/main/java/io/sentry/hints/SessionStart.java similarity index 75% rename from sentry-core/src/main/java/io/sentry/core/hints/SessionStart.java rename to sentry/src/main/java/io/sentry/hints/SessionStart.java index d9d7d6c08..6fdd7f9dd 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/SessionStart.java +++ b/sentry/src/main/java/io/sentry/hints/SessionStart.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; /** Hint that shows this is a session start envelope */ public interface SessionStart {} diff --git a/sentry-core/src/main/java/io/sentry/core/hints/SessionStartHint.java b/sentry/src/main/java/io/sentry/hints/SessionStartHint.java similarity index 68% rename from sentry-core/src/main/java/io/sentry/core/hints/SessionStartHint.java rename to sentry/src/main/java/io/sentry/hints/SessionStartHint.java index f8479553a..b59db1fe5 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/SessionStartHint.java +++ b/sentry/src/main/java/io/sentry/hints/SessionStartHint.java @@ -1,3 +1,3 @@ -package io.sentry.core.hints; +package io.sentry.hints; public final class SessionStartHint implements SessionStart {} diff --git a/sentry-core/src/main/java/io/sentry/core/hints/SubmissionResult.java b/sentry/src/main/java/io/sentry/hints/SubmissionResult.java similarity index 76% rename from sentry-core/src/main/java/io/sentry/core/hints/SubmissionResult.java rename to sentry/src/main/java/io/sentry/hints/SubmissionResult.java index 49993b549..ff25fa643 100644 --- a/sentry-core/src/main/java/io/sentry/core/hints/SubmissionResult.java +++ b/sentry/src/main/java/io/sentry/hints/SubmissionResult.java @@ -1,4 +1,4 @@ -package io.sentry.core.hints; +package io.sentry.hints; public interface SubmissionResult { void setResult(boolean success); diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/App.java b/sentry/src/main/java/io/sentry/protocol/App.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/protocol/App.java rename to sentry/src/main/java/io/sentry/protocol/App.java index bfc9abca0..6033b0d9c 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/App.java +++ b/sentry/src/main/java/io/sentry/protocol/App.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Date; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Browser.java b/sentry/src/main/java/io/sentry/protocol/Browser.java similarity index 91% rename from sentry-core/src/main/java/io/sentry/core/protocol/Browser.java rename to sentry/src/main/java/io/sentry/protocol/Browser.java index b0fa97ebd..e3c296d31 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Browser.java +++ b/sentry/src/main/java/io/sentry/protocol/Browser.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Contexts.java b/sentry/src/main/java/io/sentry/protocol/Contexts.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/protocol/Contexts.java rename to sentry/src/main/java/io/sentry/protocol/Contexts.java index 7be1aebca..f2dd6d246 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Contexts.java +++ b/sentry/src/main/java/io/sentry/protocol/Contexts.java @@ -1,4 +1,4 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/DebugImage.java b/sentry/src/main/java/io/sentry/protocol/DebugImage.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/protocol/DebugImage.java rename to sentry/src/main/java/io/sentry/protocol/DebugImage.java index a66ec30fe..598985ceb 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/DebugImage.java +++ b/sentry/src/main/java/io/sentry/protocol/DebugImage.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/DebugMeta.java b/sentry/src/main/java/io/sentry/protocol/DebugMeta.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/protocol/DebugMeta.java rename to sentry/src/main/java/io/sentry/protocol/DebugMeta.java index 8000421e3..822ace34d 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/DebugMeta.java +++ b/sentry/src/main/java/io/sentry/protocol/DebugMeta.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.List; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Device.java b/sentry/src/main/java/io/sentry/protocol/Device.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/protocol/Device.java rename to sentry/src/main/java/io/sentry/protocol/Device.java index f11fd8da3..06ddf0e11 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Device.java +++ b/sentry/src/main/java/io/sentry/protocol/Device.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Date; import java.util.Map; import java.util.TimeZone; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Gpu.java b/sentry/src/main/java/io/sentry/protocol/Gpu.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/protocol/Gpu.java rename to sentry/src/main/java/io/sentry/protocol/Gpu.java index ec8d28b51..f407512d1 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Gpu.java +++ b/sentry/src/main/java/io/sentry/protocol/Gpu.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Mechanism.java b/sentry/src/main/java/io/sentry/protocol/Mechanism.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/protocol/Mechanism.java rename to sentry/src/main/java/io/sentry/protocol/Mechanism.java index fd5c8b4b7..e10bc01b7 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Mechanism.java +++ b/sentry/src/main/java/io/sentry/protocol/Mechanism.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Message.java b/sentry/src/main/java/io/sentry/protocol/Message.java similarity index 92% rename from sentry-core/src/main/java/io/sentry/core/protocol/Message.java rename to sentry/src/main/java/io/sentry/protocol/Message.java index 96d95d788..001c5c5bf 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Message.java +++ b/sentry/src/main/java/io/sentry/protocol/Message.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.List; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/OperatingSystem.java b/sentry/src/main/java/io/sentry/protocol/OperatingSystem.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/protocol/OperatingSystem.java rename to sentry/src/main/java/io/sentry/protocol/OperatingSystem.java index 53be02361..54272d405 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/OperatingSystem.java +++ b/sentry/src/main/java/io/sentry/protocol/OperatingSystem.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Request.java b/sentry/src/main/java/io/sentry/protocol/Request.java similarity index 95% rename from sentry-core/src/main/java/io/sentry/core/protocol/Request.java rename to sentry/src/main/java/io/sentry/protocol/Request.java index 141d1e55a..8e6b539a9 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/Request.java +++ b/sentry/src/main/java/io/sentry/protocol/Request.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SdkInfo.java b/sentry/src/main/java/io/sentry/protocol/SdkInfo.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/protocol/SdkInfo.java rename to sentry/src/main/java/io/sentry/protocol/SdkInfo.java index 892db05f0..547c4cff1 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SdkInfo.java +++ b/sentry/src/main/java/io/sentry/protocol/SdkInfo.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SdkVersion.java b/sentry/src/main/java/io/sentry/protocol/SdkVersion.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/protocol/SdkVersion.java rename to sentry/src/main/java/io/sentry/protocol/SdkVersion.java index 4621be33d..b37a44227 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SdkVersion.java +++ b/sentry/src/main/java/io/sentry/protocol/SdkVersion.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryException.java b/sentry/src/main/java/io/sentry/protocol/SentryException.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryException.java rename to sentry/src/main/java/io/sentry/protocol/SentryException.java index e61df0029..2beb26bbe 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryException.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryException.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryId.java b/sentry/src/main/java/io/sentry/protocol/SentryId.java similarity index 98% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryId.java rename to sentry/src/main/java/io/sentry/protocol/SentryId.java index 6fc32b754..7606e0d44 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryId.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryId.java @@ -1,4 +1,4 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; import java.util.UUID; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryPackage.java b/sentry/src/main/java/io/sentry/protocol/SentryPackage.java similarity index 88% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryPackage.java rename to sentry/src/main/java/io/sentry/protocol/SentryPackage.java index 646de45e9..01cb92847 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryPackage.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryPackage.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryRuntime.java b/sentry/src/main/java/io/sentry/protocol/SentryRuntime.java similarity index 92% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryRuntime.java rename to sentry/src/main/java/io/sentry/protocol/SentryRuntime.java index e5d6735ca..45e5b322a 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryRuntime.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryRuntime.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryStackFrame.java b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryStackFrame.java rename to sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java index dbb328ab5..5d39a2a83 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryStackFrame.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; import com.google.gson.annotations.SerializedName; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.List; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryStackTrace.java b/sentry/src/main/java/io/sentry/protocol/SentryStackTrace.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryStackTrace.java rename to sentry/src/main/java/io/sentry/protocol/SentryStackTrace.java index 874f1469a..b70a03f8b 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryStackTrace.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryStackTrace.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.List; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/SentryThread.java b/sentry/src/main/java/io/sentry/protocol/SentryThread.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/protocol/SentryThread.java rename to sentry/src/main/java/io/sentry/protocol/SentryThread.java index 37ef583be..88e9345b9 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/SentryThread.java +++ b/sentry/src/main/java/io/sentry/protocol/SentryThread.java @@ -1,6 +1,6 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; +import io.sentry.IUnknownPropertiesConsumer; import java.util.Map; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/User.java b/sentry/src/main/java/io/sentry/protocol/User.java similarity index 96% rename from sentry-core/src/main/java/io/sentry/core/protocol/User.java rename to sentry/src/main/java/io/sentry/protocol/User.java index 911624096..7cb42ccc3 100644 --- a/sentry-core/src/main/java/io/sentry/core/protocol/User.java +++ b/sentry/src/main/java/io/sentry/protocol/User.java @@ -1,7 +1,7 @@ -package io.sentry.core.protocol; +package io.sentry.protocol; -import io.sentry.core.IUnknownPropertiesConsumer; -import io.sentry.core.util.CollectionUtils; +import io.sentry.IUnknownPropertiesConsumer; +import io.sentry.util.CollectionUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/AsyncConnection.java b/sentry/src/main/java/io/sentry/transport/AsyncConnection.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/transport/AsyncConnection.java rename to sentry/src/main/java/io/sentry/transport/AsyncConnection.java index 5e7b484b9..853f83374 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/AsyncConnection.java +++ b/sentry/src/main/java/io/sentry/transport/AsyncConnection.java @@ -1,17 +1,17 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.ILogger; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.SentryEnvelopeItem; -import io.sentry.core.SentryLevel; -import io.sentry.core.SentryOptions; -import io.sentry.core.cache.IEnvelopeCache; -import io.sentry.core.hints.Cached; -import io.sentry.core.hints.DiskFlushNotification; -import io.sentry.core.hints.Retryable; -import io.sentry.core.hints.SubmissionResult; -import io.sentry.core.util.LogUtils; -import io.sentry.core.util.Objects; +import io.sentry.ILogger; +import io.sentry.SentryEnvelope; +import io.sentry.SentryEnvelopeItem; +import io.sentry.SentryLevel; +import io.sentry.SentryOptions; +import io.sentry.cache.IEnvelopeCache; +import io.sentry.hints.Cached; +import io.sentry.hints.DiskFlushNotification; +import io.sentry.hints.Retryable; +import io.sentry.hints.SubmissionResult; +import io.sentry.util.LogUtils; +import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; import java.util.ArrayList; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/Connection.java b/sentry/src/main/java/io/sentry/transport/Connection.java similarity index 81% rename from sentry-core/src/main/java/io/sentry/core/transport/Connection.java rename to sentry/src/main/java/io/sentry/transport/Connection.java index d925c1b4c..9aa8a39db 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/Connection.java +++ b/sentry/src/main/java/io/sentry/transport/Connection.java @@ -1,6 +1,6 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.SentryEnvelope; +import io.sentry.SentryEnvelope; import java.io.IOException; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/CurrentDateProvider.java b/sentry/src/main/java/io/sentry/transport/CurrentDateProvider.java similarity index 92% rename from sentry-core/src/main/java/io/sentry/core/transport/CurrentDateProvider.java rename to sentry/src/main/java/io/sentry/transport/CurrentDateProvider.java index 289b6e048..9421baac5 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/CurrentDateProvider.java +++ b/sentry/src/main/java/io/sentry/transport/CurrentDateProvider.java @@ -1,4 +1,4 @@ -package io.sentry.core.transport; +package io.sentry.transport; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/HttpTransport.java b/sentry/src/main/java/io/sentry/transport/HttpTransport.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/transport/HttpTransport.java rename to sentry/src/main/java/io/sentry/transport/HttpTransport.java index bc0c257f8..e8b0b410c 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/HttpTransport.java +++ b/sentry/src/main/java/io/sentry/transport/HttpTransport.java @@ -1,17 +1,17 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import static io.sentry.core.SentryLevel.DEBUG; -import static io.sentry.core.SentryLevel.ERROR; -import static io.sentry.core.SentryLevel.INFO; +import static io.sentry.SentryLevel.DEBUG; +import static io.sentry.SentryLevel.ERROR; +import static io.sentry.SentryLevel.INFO; import static java.net.HttpURLConnection.HTTP_OK; import com.jakewharton.nopen.annotation.Open; -import io.sentry.core.ILogger; -import io.sentry.core.ISerializer; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.SentryOptions; -import io.sentry.core.util.Objects; -import io.sentry.core.util.StringUtils; +import io.sentry.ILogger; +import io.sentry.ISerializer; +import io.sentry.SentryEnvelope; +import io.sentry.SentryOptions; +import io.sentry.util.Objects; +import io.sentry.util.StringUtils; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -88,8 +88,8 @@ public String getCategory() { /** * Constructs a new HTTP transport instance. Notably, the provided {@code requestUpdater} must set - * the appropriate content encoding header for the {@link io.sentry.core.ISerializer} instance - * obtained from the options. + * the appropriate content encoding header for the {@link io.sentry.ISerializer} instance obtained + * from the options. * * @param options sentry options to read the config from * @param connectionConfigurator this consumer is given a chance to set up the request before it diff --git a/sentry-core/src/main/java/io/sentry/core/transport/IConnectionConfigurator.java b/sentry/src/main/java/io/sentry/transport/IConnectionConfigurator.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/transport/IConnectionConfigurator.java rename to sentry/src/main/java/io/sentry/transport/IConnectionConfigurator.java index a067095ed..11337926b 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/IConnectionConfigurator.java +++ b/sentry/src/main/java/io/sentry/transport/IConnectionConfigurator.java @@ -1,4 +1,4 @@ -package io.sentry.core.transport; +package io.sentry.transport; import java.net.HttpURLConnection; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/ICurrentDateProvider.java b/sentry/src/main/java/io/sentry/transport/ICurrentDateProvider.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/transport/ICurrentDateProvider.java rename to sentry/src/main/java/io/sentry/transport/ICurrentDateProvider.java index a4f681002..b4f86cf2d 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/ICurrentDateProvider.java +++ b/sentry/src/main/java/io/sentry/transport/ICurrentDateProvider.java @@ -1,4 +1,4 @@ -package io.sentry.core.transport; +package io.sentry.transport; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/ITransport.java b/sentry/src/main/java/io/sentry/transport/ITransport.java similarity index 79% rename from sentry-core/src/main/java/io/sentry/core/transport/ITransport.java rename to sentry/src/main/java/io/sentry/transport/ITransport.java index c0b165285..6ce301b5f 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/ITransport.java +++ b/sentry/src/main/java/io/sentry/transport/ITransport.java @@ -1,6 +1,6 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.SentryEnvelope; +import io.sentry.SentryEnvelope; import java.io.Closeable; import java.io.IOException; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/ITransportGate.java b/sentry/src/main/java/io/sentry/transport/ITransportGate.java similarity index 94% rename from sentry-core/src/main/java/io/sentry/core/transport/ITransportGate.java rename to sentry/src/main/java/io/sentry/transport/ITransportGate.java index 2493a8969..2a26658c9 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/ITransportGate.java +++ b/sentry/src/main/java/io/sentry/transport/ITransportGate.java @@ -1,4 +1,4 @@ -package io.sentry.core.transport; +package io.sentry.transport; /** * Implementations of this interface serve as gatekeepers that allow or disallow sending of the diff --git a/sentry-core/src/main/java/io/sentry/core/transport/NoOpEnvelopeCache.java b/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java similarity index 84% rename from sentry-core/src/main/java/io/sentry/core/transport/NoOpEnvelopeCache.java rename to sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java index 82b63959c..712623b17 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/NoOpEnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java @@ -1,7 +1,7 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.cache.IEnvelopeCache; +import io.sentry.SentryEnvelope; +import io.sentry.cache.IEnvelopeCache; import java.util.ArrayList; import java.util.Iterator; import org.jetbrains.annotations.NotNull; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/NoOpTransport.java b/sentry/src/main/java/io/sentry/transport/NoOpTransport.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/transport/NoOpTransport.java rename to sentry/src/main/java/io/sentry/transport/NoOpTransport.java index f3e856c6c..194ef1535 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/NoOpTransport.java +++ b/sentry/src/main/java/io/sentry/transport/NoOpTransport.java @@ -1,6 +1,6 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.SentryEnvelope; +import io.sentry.SentryEnvelope; import java.io.IOException; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/NoOpTransportGate.java b/sentry/src/main/java/io/sentry/transport/NoOpTransportGate.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/transport/NoOpTransportGate.java rename to sentry/src/main/java/io/sentry/transport/NoOpTransportGate.java index e9992d275..6b14f5ae3 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/NoOpTransportGate.java +++ b/sentry/src/main/java/io/sentry/transport/NoOpTransportGate.java @@ -1,4 +1,4 @@ -package io.sentry.core.transport; +package io.sentry.transport; public final class NoOpTransportGate implements ITransportGate { diff --git a/sentry-core/src/main/java/io/sentry/core/transport/QueuedThreadPoolExecutor.java b/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/transport/QueuedThreadPoolExecutor.java rename to sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java index 9ed64167a..dda6a985c 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/QueuedThreadPoolExecutor.java +++ b/sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java @@ -1,7 +1,7 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import java.util.concurrent.CancellationException; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/StdoutTransport.java b/sentry/src/main/java/io/sentry/transport/StdoutTransport.java similarity index 89% rename from sentry-core/src/main/java/io/sentry/core/transport/StdoutTransport.java rename to sentry/src/main/java/io/sentry/transport/StdoutTransport.java index f5b9c1929..058db0719 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/StdoutTransport.java +++ b/sentry/src/main/java/io/sentry/transport/StdoutTransport.java @@ -1,8 +1,8 @@ -package io.sentry.core.transport; +package io.sentry.transport; -import io.sentry.core.ISerializer; -import io.sentry.core.SentryEnvelope; -import io.sentry.core.util.Objects; +import io.sentry.ISerializer; +import io.sentry.SentryEnvelope; +import io.sentry.util.Objects; import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/sentry-core/src/main/java/io/sentry/core/transport/TransportResult.java b/sentry/src/main/java/io/sentry/transport/TransportResult.java similarity index 93% rename from sentry-core/src/main/java/io/sentry/core/transport/TransportResult.java rename to sentry/src/main/java/io/sentry/transport/TransportResult.java index 845eb38b4..301296f00 100644 --- a/sentry-core/src/main/java/io/sentry/core/transport/TransportResult.java +++ b/sentry/src/main/java/io/sentry/transport/TransportResult.java @@ -1,9 +1,9 @@ -package io.sentry.core.transport; +package io.sentry.transport; import org.jetbrains.annotations.NotNull; /** - * A result of {@link ITransport#send(io.sentry.core.SentryEnvelope)}. Note that this class is + * A result of {@link ITransport#send(io.sentry.SentryEnvelope)}. Note that this class is * intentionally not subclassable and has only two factory methods to capture the 2 possible states * - success or error. */ diff --git a/sentry-core/src/main/java/io/sentry/core/util/ApplyScopeUtils.java b/sentry/src/main/java/io/sentry/util/ApplyScopeUtils.java similarity index 85% rename from sentry-core/src/main/java/io/sentry/core/util/ApplyScopeUtils.java rename to sentry/src/main/java/io/sentry/util/ApplyScopeUtils.java index 002a6c124..420540ae0 100644 --- a/sentry-core/src/main/java/io/sentry/core/util/ApplyScopeUtils.java +++ b/sentry/src/main/java/io/sentry/util/ApplyScopeUtils.java @@ -1,7 +1,7 @@ -package io.sentry.core.util; +package io.sentry.util; -import io.sentry.core.hints.ApplyScopeData; -import io.sentry.core.hints.Cached; +import io.sentry.hints.ApplyScopeData; +import io.sentry.hints.Cached; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/util/CollectionUtils.java b/sentry/src/main/java/io/sentry/util/CollectionUtils.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/util/CollectionUtils.java rename to sentry/src/main/java/io/sentry/util/CollectionUtils.java index 9fc6b95a5..b4f29dc6c 100644 --- a/sentry-core/src/main/java/io/sentry/core/util/CollectionUtils.java +++ b/sentry/src/main/java/io/sentry/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package io.sentry.core.util; +package io.sentry.util; import java.util.Collection; import java.util.Map; diff --git a/sentry-core/src/main/java/io/sentry/core/util/LogUtils.java b/sentry/src/main/java/io/sentry/util/LogUtils.java similarity index 87% rename from sentry-core/src/main/java/io/sentry/core/util/LogUtils.java rename to sentry/src/main/java/io/sentry/util/LogUtils.java index 717802e7b..6e5ba9a61 100644 --- a/sentry-core/src/main/java/io/sentry/core/util/LogUtils.java +++ b/sentry/src/main/java/io/sentry/util/LogUtils.java @@ -1,7 +1,7 @@ -package io.sentry.core.util; +package io.sentry.util; -import io.sentry.core.ILogger; -import io.sentry.core.SentryLevel; +import io.sentry.ILogger; +import io.sentry.SentryLevel; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-core/src/main/java/io/sentry/core/util/Objects.java b/sentry/src/main/java/io/sentry/util/Objects.java similarity index 90% rename from sentry-core/src/main/java/io/sentry/core/util/Objects.java rename to sentry/src/main/java/io/sentry/util/Objects.java index aed1623cc..f39fa2c58 100644 --- a/sentry-core/src/main/java/io/sentry/core/util/Objects.java +++ b/sentry/src/main/java/io/sentry/util/Objects.java @@ -1,4 +1,4 @@ -package io.sentry.core.util; +package io.sentry.util; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/main/java/io/sentry/core/util/StringUtils.java b/sentry/src/main/java/io/sentry/util/StringUtils.java similarity index 97% rename from sentry-core/src/main/java/io/sentry/core/util/StringUtils.java rename to sentry/src/main/java/io/sentry/util/StringUtils.java index 652f3cb03..05b938baf 100644 --- a/sentry-core/src/main/java/io/sentry/core/util/StringUtils.java +++ b/sentry/src/main/java/io/sentry/util/StringUtils.java @@ -1,4 +1,4 @@ -package io.sentry.core.util; +package io.sentry.util; import java.util.Locale; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-core/src/test/java/io/sentry/core/BreadcrumbTest.kt b/sentry/src/test/java/io/sentry/BreadcrumbTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/BreadcrumbTest.kt rename to sentry/src/test/java/io/sentry/BreadcrumbTest.kt index f7a2a9258..a1971bb72 100644 --- a/sentry-core/src/test/java/io/sentry/core/BreadcrumbTest.kt +++ b/sentry/src/test/java/io/sentry/BreadcrumbTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry/src/test/java/io/sentry/CachedEvent.kt b/sentry/src/test/java/io/sentry/CachedEvent.kt new file mode 100644 index 000000000..5afdbe5d6 --- /dev/null +++ b/sentry/src/test/java/io/sentry/CachedEvent.kt @@ -0,0 +1,5 @@ +package io.sentry + +import io.sentry.hints.Cached + +class CachedEvent : Cached diff --git a/sentry-core/src/test/java/io/sentry/core/CustomEventProcessor.kt b/sentry/src/test/java/io/sentry/CustomEventProcessor.kt similarity index 84% rename from sentry-core/src/test/java/io/sentry/core/CustomEventProcessor.kt rename to sentry/src/test/java/io/sentry/CustomEventProcessor.kt index 57dbf2acb..5845c6286 100644 --- a/sentry-core/src/test/java/io/sentry/core/CustomEventProcessor.kt +++ b/sentry/src/test/java/io/sentry/CustomEventProcessor.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry class CustomEventProcessor : EventProcessor { override fun process(event: SentryEvent, hint: Any?): SentryEvent? = null diff --git a/sentry-core/src/test/java/io/sentry/core/DateUtilsTest.kt b/sentry/src/test/java/io/sentry/DateUtilsTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/DateUtilsTest.kt rename to sentry/src/test/java/io/sentry/DateUtilsTest.kt index a4694e9ff..eeedb7e57 100644 --- a/sentry-core/src/test/java/io/sentry/core/DateUtilsTest.kt +++ b/sentry/src/test/java/io/sentry/DateUtilsTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/DiagnosticLoggerTest.kt b/sentry/src/test/java/io/sentry/DiagnosticLoggerTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/DiagnosticLoggerTest.kt rename to sentry/src/test/java/io/sentry/DiagnosticLoggerTest.kt index 110a5e23d..c8af2a636 100644 --- a/sentry-core/src/test/java/io/sentry/core/DiagnosticLoggerTest.kt +++ b/sentry/src/test/java/io/sentry/DiagnosticLoggerTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/DirectoryProcessorTest.kt b/sentry/src/test/java/io/sentry/DirectoryProcessorTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/DirectoryProcessorTest.kt rename to sentry/src/test/java/io/sentry/DirectoryProcessorTest.kt index 153b948a9..2c130de02 100644 --- a/sentry-core/src/test/java/io/sentry/core/DirectoryProcessorTest.kt +++ b/sentry/src/test/java/io/sentry/DirectoryProcessorTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.argWhere @@ -6,9 +6,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.hints.ApplyScopeData -import io.sentry.core.protocol.User -import io.sentry.core.util.noFlushTimeout +import io.sentry.hints.ApplyScopeData +import io.sentry.protocol.User +import io.sentry.util.noFlushTimeout import java.io.File import java.nio.file.Files import java.nio.file.Paths diff --git a/sentry-core/src/test/java/io/sentry/core/DsnTest.kt b/sentry/src/test/java/io/sentry/DsnTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/DsnTest.kt rename to sentry/src/test/java/io/sentry/DsnTest.kt index bdc2ebe6c..0d1e9c314 100644 --- a/sentry-core/src/test/java/io/sentry/core/DsnTest.kt +++ b/sentry/src/test/java/io/sentry/DsnTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/DuplicateEventDetectionEventProcessorTest.kt b/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt similarity index 94% rename from sentry-core/src/test/java/io/sentry/core/DuplicateEventDetectionEventProcessorTest.kt rename to sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt index 3867fd5f5..b2e7ec0ef 100644 --- a/sentry-core/src/test/java/io/sentry/core/DuplicateEventDetectionEventProcessorTest.kt +++ b/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt @@ -1,7 +1,7 @@ -package io.sentry.core +package io.sentry -import io.sentry.core.exception.ExceptionMechanismException -import io.sentry.core.protocol.Mechanism +import io.sentry.exception.ExceptionMechanismException +import io.sentry.protocol.Mechanism import java.lang.RuntimeException import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/sentry-core/src/test/java/io/sentry/core/EnvelopeSenderTest.kt b/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/EnvelopeSenderTest.kt rename to sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt index 6ae37997f..595a2cf98 100644 --- a/sentry-core/src/test/java/io/sentry/core/EnvelopeSenderTest.kt +++ b/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doThrow @@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.cache.EnvelopeCache -import io.sentry.core.hints.Retryable -import io.sentry.core.util.noFlushTimeout +import io.sentry.cache.EnvelopeCache +import io.sentry.hints.Retryable +import io.sentry.util.noFlushTimeout import java.io.File import java.nio.file.Files import java.nio.file.Path diff --git a/sentry-core/src/test/java/io/sentry/core/FileFromResources.kt b/sentry/src/test/java/io/sentry/FileFromResources.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/FileFromResources.kt rename to sentry/src/test/java/io/sentry/FileFromResources.kt index 541a31c77..d9c9f78ed 100644 --- a/sentry-core/src/test/java/io/sentry/core/FileFromResources.kt +++ b/sentry/src/test/java/io/sentry/FileFromResources.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import java.io.File import java.util.Scanner diff --git a/sentry-core/src/test/java/io/sentry/core/GsonSerializerTest.kt b/sentry/src/test/java/io/sentry/GsonSerializerTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/GsonSerializerTest.kt rename to sentry/src/test/java/io/sentry/GsonSerializerTest.kt index bc63a0fdb..150aac161 100644 --- a/sentry-core/src/test/java/io/sentry/core/GsonSerializerTest.kt +++ b/sentry/src/test/java/io/sentry/GsonSerializerTest.kt @@ -1,13 +1,13 @@ -package io.sentry.core +package io.sentry import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.protocol.Contexts -import io.sentry.core.protocol.Device -import io.sentry.core.protocol.SdkVersion +import io.sentry.protocol.Contexts +import io.sentry.protocol.Device +import io.sentry.protocol.SdkVersion import java.io.ByteArrayInputStream import java.io.IOException import java.io.InputStream diff --git a/sentry-core/src/test/java/io/sentry/core/HttpTransportFactoryTest.kt b/sentry/src/test/java/io/sentry/HttpTransportFactoryTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/HttpTransportFactoryTest.kt rename to sentry/src/test/java/io/sentry/HttpTransportFactoryTest.kt index ab05b1c73..2ac1a30b6 100644 --- a/sentry-core/src/test/java/io/sentry/core/HttpTransportFactoryTest.kt +++ b/sentry/src/test/java/io/sentry/HttpTransportFactoryTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertFailsWith diff --git a/sentry-core/src/test/java/io/sentry/core/HubTest.kt b/sentry/src/test/java/io/sentry/HubTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/HubTest.kt rename to sentry/src/test/java/io/sentry/HubTest.kt index 3c6fc1acf..89c6f803d 100644 --- a/sentry-core/src/test/java/io/sentry/core/HubTest.kt +++ b/sentry/src/test/java/io/sentry/HubTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.anyOrNull @@ -12,10 +12,10 @@ import com.nhaarman.mockitokotlin2.times import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.hints.SessionEndHint -import io.sentry.core.hints.SessionStartHint -import io.sentry.core.protocol.SentryId -import io.sentry.core.protocol.User +import io.sentry.hints.SessionEndHint +import io.sentry.hints.SessionStartHint +import io.sentry.protocol.SentryId +import io.sentry.protocol.User import java.io.File import java.nio.file.Files import java.util.Queue diff --git a/sentry-core/src/test/java/io/sentry/core/MainEventProcessorTest.kt b/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/MainEventProcessorTest.kt rename to sentry/src/test/java/io/sentry/MainEventProcessorTest.kt index 2f0cb67ed..50f932dd2 100644 --- a/sentry-core/src/test/java/io/sentry/core/MainEventProcessorTest.kt +++ b/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt @@ -1,9 +1,9 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.hints.ApplyScopeData -import io.sentry.core.hints.Cached -import io.sentry.core.protocol.SdkVersion +import io.sentry.hints.ApplyScopeData +import io.sentry.hints.Cached +import io.sentry.protocol.SdkVersion import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/sentry-core/src/test/java/io/sentry/core/NoOpHubTest.kt b/sentry/src/test/java/io/sentry/NoOpHubTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/NoOpHubTest.kt rename to sentry/src/test/java/io/sentry/NoOpHubTest.kt index 5501ce062..3575a6f86 100644 --- a/sentry-core/src/test/java/io/sentry/core/NoOpHubTest.kt +++ b/sentry/src/test/java/io/sentry/NoOpHubTest.kt @@ -1,6 +1,6 @@ -package io.sentry.core +package io.sentry -import io.sentry.core.protocol.SentryId +import io.sentry.protocol.SentryId import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/sentry-core/src/test/java/io/sentry/core/NoOpSentryClientTest.kt b/sentry/src/test/java/io/sentry/NoOpSentryClientTest.kt similarity index 94% rename from sentry-core/src/test/java/io/sentry/core/NoOpSentryClientTest.kt rename to sentry/src/test/java/io/sentry/NoOpSentryClientTest.kt index eca741f62..e3949b80b 100644 --- a/sentry-core/src/test/java/io/sentry/core/NoOpSentryClientTest.kt +++ b/sentry/src/test/java/io/sentry/NoOpSentryClientTest.kt @@ -1,6 +1,6 @@ -package io.sentry.core +package io.sentry -import io.sentry.core.protocol.SentryId +import io.sentry.protocol.SentryId import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/sentry-core/src/test/java/io/sentry/core/NoOpSerializerTest.kt b/sentry/src/test/java/io/sentry/NoOpSerializerTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/NoOpSerializerTest.kt rename to sentry/src/test/java/io/sentry/NoOpSerializerTest.kt index 999349723..d7b4d0368 100644 --- a/sentry-core/src/test/java/io/sentry/core/NoOpSerializerTest.kt +++ b/sentry/src/test/java/io/sentry/NoOpSerializerTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/OptionsContainerTest.kt b/sentry/src/test/java/io/sentry/OptionsContainerTest.kt similarity index 92% rename from sentry-core/src/test/java/io/sentry/core/OptionsContainerTest.kt rename to sentry/src/test/java/io/sentry/OptionsContainerTest.kt index 7f9f7fedf..804f239f5 100644 --- a/sentry-core/src/test/java/io/sentry/core/OptionsContainerTest.kt +++ b/sentry/src/test/java/io/sentry/OptionsContainerTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertTrue diff --git a/sentry-core/src/test/java/io/sentry/core/OutboxSenderTest.kt b/sentry/src/test/java/io/sentry/OutboxSenderTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/OutboxSenderTest.kt rename to sentry/src/test/java/io/sentry/OutboxSenderTest.kt index 56e91f914..e58fee324 100644 --- a/sentry-core/src/test/java/io/sentry/core/OutboxSenderTest.kt +++ b/sentry/src/test/java/io/sentry/OutboxSenderTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.argWhere @@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.cache.EnvelopeCache -import io.sentry.core.hints.Retryable -import io.sentry.core.protocol.SentryId +import io.sentry.cache.EnvelopeCache +import io.sentry.hints.Retryable +import io.sentry.protocol.SentryId import java.io.File import java.io.FileNotFoundException import java.nio.file.Files @@ -140,7 +140,7 @@ class OutboxSenderTest { @Test fun `when hub is null, ctor throws`() { - val clazz = Class.forName("io.sentry.core.OutboxSender") + val clazz = Class.forName("io.sentry.OutboxSender") val ctor = clazz.getConstructor(IHub::class.java, IEnvelopeReader::class.java, ISerializer::class.java, ILogger::class.java, Long::class.java) val params = arrayOf(null, mock(), mock(), mock(), null) assertFailsWith { ctor.newInstance(params) } @@ -148,7 +148,7 @@ class OutboxSenderTest { @Test fun `when envelopeReader is null, ctor throws`() { - val clazz = Class.forName("io.sentry.core.OutboxSender") + val clazz = Class.forName("io.sentry.OutboxSender") val ctor = clazz.getConstructor(IHub::class.java, IEnvelopeReader::class.java, ISerializer::class.java, ILogger::class.java, Long::class.java) val params = arrayOf(mock(), null, mock(), mock(), 15000) assertFailsWith { ctor.newInstance(params) } @@ -156,7 +156,7 @@ class OutboxSenderTest { @Test fun `when serializer is null, ctor throws`() { - val clazz = Class.forName("io.sentry.core.OutboxSender") + val clazz = Class.forName("io.sentry.OutboxSender") val ctor = clazz.getConstructor(IHub::class.java, IEnvelopeReader::class.java, ISerializer::class.java, ILogger::class.java, Long::class.java) val params = arrayOf(mock(), mock(), null, mock(), 15000) assertFailsWith { ctor.newInstance(params) } @@ -164,7 +164,7 @@ class OutboxSenderTest { @Test fun `when logger is null, ctor throws`() { - val clazz = Class.forName("io.sentry.core.OutboxSender") + val clazz = Class.forName("io.sentry.OutboxSender") val ctor = clazz.getConstructor(IHub::class.java, IEnvelopeReader::class.java, ISerializer::class.java, ILogger::class.java, Long::class.java) val params = arrayOf(mock(), mock(), mock(), null, 15000) assertFailsWith { ctor.newInstance(params) } diff --git a/sentry-core/src/test/java/io/sentry/core/SampleDsn.kt b/sentry/src/test/java/io/sentry/SampleDsn.kt similarity index 93% rename from sentry-core/src/test/java/io/sentry/core/SampleDsn.kt rename to sentry/src/test/java/io/sentry/SampleDsn.kt index 7bd705df3..0ddabd4b6 100644 --- a/sentry-core/src/test/java/io/sentry/core/SampleDsn.kt +++ b/sentry/src/test/java/io/sentry/SampleDsn.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry // Legacy DSN includes a secret. Sentry 8 and older will require it. const val dsnStringLegacy: String = "https://d4d82fc1c2c4032a83f3a29aa3a3aff:ed0a8589a0bb4d4793ac4c70375f3d65@fake-sentry.io:65535/2147483647" diff --git a/sentry-core/src/test/java/io/sentry/core/ScopeTest.kt b/sentry/src/test/java/io/sentry/ScopeTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/ScopeTest.kt rename to sentry/src/test/java/io/sentry/ScopeTest.kt index ea37ae867..5c7cd39b8 100644 --- a/sentry-core/src/test/java/io/sentry/core/ScopeTest.kt +++ b/sentry/src/test/java/io/sentry/ScopeTest.kt @@ -1,6 +1,6 @@ -package io.sentry.core +package io.sentry -import io.sentry.core.protocol.User +import io.sentry.protocol.User import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-core/src/test/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegrationTest.kt b/sentry/src/test/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegrationTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegrationTest.kt rename to sentry/src/test/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegrationTest.kt index fb32a8e08..7aa6ae716 100644 --- a/sentry-core/src/test/java/io/sentry/core/SendCachedEnvelopeFireAndForgetIntegrationTest.kt +++ b/sentry/src/test/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegrationTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt b/sentry/src/test/java/io/sentry/SentryClientTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt rename to sentry/src/test/java/io/sentry/SentryClientTest.kt index b050dc592..92e355aaa 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt +++ b/sentry/src/test/java/io/sentry/SentryClientTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.anyOrNull @@ -10,18 +10,18 @@ import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.hints.ApplyScopeData -import io.sentry.core.hints.Cached -import io.sentry.core.hints.DiskFlushNotification -import io.sentry.core.protocol.Mechanism -import io.sentry.core.protocol.Request -import io.sentry.core.protocol.SdkVersion -import io.sentry.core.protocol.SentryException -import io.sentry.core.protocol.SentryId -import io.sentry.core.protocol.User -import io.sentry.core.transport.AsyncConnection -import io.sentry.core.transport.HttpTransport -import io.sentry.core.transport.ITransportGate +import io.sentry.hints.ApplyScopeData +import io.sentry.hints.Cached +import io.sentry.hints.DiskFlushNotification +import io.sentry.protocol.Mechanism +import io.sentry.protocol.Request +import io.sentry.protocol.SdkVersion +import io.sentry.protocol.SentryException +import io.sentry.protocol.SentryId +import io.sentry.protocol.User +import io.sentry.transport.AsyncConnection +import io.sentry.transport.HttpTransport +import io.sentry.transport.ITransportGate import java.io.ByteArrayInputStream import java.io.IOException import java.io.InputStreamReader diff --git a/sentry-core/src/test/java/io/sentry/core/SentryEnvelopeItemTest.kt b/sentry/src/test/java/io/sentry/SentryEnvelopeItemTest.kt similarity index 92% rename from sentry-core/src/test/java/io/sentry/core/SentryEnvelopeItemTest.kt rename to sentry/src/test/java/io/sentry/SentryEnvelopeItemTest.kt index cf19266e9..9cc15c9ae 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryEnvelopeItemTest.kt +++ b/sentry/src/test/java/io/sentry/SentryEnvelopeItemTest.kt @@ -1,7 +1,7 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.protocol.User +import io.sentry.protocol.User import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-core/src/test/java/io/sentry/core/SentryEnvelopeTest.kt b/sentry/src/test/java/io/sentry/SentryEnvelopeTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SentryEnvelopeTest.kt rename to sentry/src/test/java/io/sentry/SentryEnvelopeTest.kt index d6582211d..227490dd4 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryEnvelopeTest.kt +++ b/sentry/src/test/java/io/sentry/SentryEnvelopeTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/SentryEventTest.kt b/sentry/src/test/java/io/sentry/SentryEventTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/SentryEventTest.kt rename to sentry/src/test/java/io/sentry/SentryEventTest.kt index 83fdd355d..76b4afb06 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryEventTest.kt +++ b/sentry/src/test/java/io/sentry/SentryEventTest.kt @@ -1,9 +1,9 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.exception.ExceptionMechanismException -import io.sentry.core.protocol.Mechanism -import io.sentry.core.protocol.SentryId +import io.sentry.exception.ExceptionMechanismException +import io.sentry.protocol.Mechanism +import io.sentry.protocol.SentryId import java.time.Instant import java.time.OffsetDateTime import java.time.format.DateTimeFormatter diff --git a/sentry-core/src/test/java/io/sentry/core/SentryExceptionFactoryTest.kt b/sentry/src/test/java/io/sentry/SentryExceptionFactoryTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/SentryExceptionFactoryTest.kt rename to sentry/src/test/java/io/sentry/SentryExceptionFactoryTest.kt index 471680856..5e77ad01d 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryExceptionFactoryTest.kt +++ b/sentry/src/test/java/io/sentry/SentryExceptionFactoryTest.kt @@ -1,7 +1,7 @@ -package io.sentry.core +package io.sentry -import io.sentry.core.exception.ExceptionMechanismException -import io.sentry.core.protocol.Mechanism +import io.sentry.exception.ExceptionMechanismException +import io.sentry.protocol.Mechanism import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/sentry-core/src/test/java/io/sentry/core/SentryExecutorServiceTest.kt b/sentry/src/test/java/io/sentry/SentryExecutorServiceTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SentryExecutorServiceTest.kt rename to sentry/src/test/java/io/sentry/SentryExecutorServiceTest.kt index a4b9bfffc..fc5845717 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryExecutorServiceTest.kt +++ b/sentry/src/test/java/io/sentry/SentryExecutorServiceTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/SentryItemTypeTest.kt b/sentry/src/test/java/io/sentry/SentryItemTypeTest.kt similarity index 93% rename from sentry-core/src/test/java/io/sentry/core/SentryItemTypeTest.kt rename to sentry/src/test/java/io/sentry/SentryItemTypeTest.kt index af6b47dc6..945c53ebb 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryItemTypeTest.kt +++ b/sentry/src/test/java/io/sentry/SentryItemTypeTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/SentryOptionsTest.kt b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt similarity index 98% rename from sentry-core/src/test/java/io/sentry/core/SentryOptionsTest.kt rename to sentry/src/test/java/io/sentry/SentryOptionsTest.kt index 89732b673..81d260b29 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryOptionsTest.kt +++ b/sentry/src/test/java/io/sentry/SentryOptionsTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import java.io.File import kotlin.test.Test @@ -122,7 +122,7 @@ class SentryOptionsTest { assertEquals(BuildConfig.VERSION_NAME, sdkVersion.version) assertTrue(sdkVersion.packages!!.any { - it.name == "maven:sentry-core" && + it.name == "maven:sentry" && it.version == BuildConfig.VERSION_NAME }) } diff --git a/sentry-core/src/test/java/io/sentry/core/SentryStackTraceFactoryTest.kt b/sentry/src/test/java/io/sentry/SentryStackTraceFactoryTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SentryStackTraceFactoryTest.kt rename to sentry/src/test/java/io/sentry/SentryStackTraceFactoryTest.kt index 7be89bd68..29e48101f 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryStackTraceFactoryTest.kt +++ b/sentry/src/test/java/io/sentry/SentryStackTraceFactoryTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/SentryTest.kt b/sentry/src/test/java/io/sentry/SentryTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SentryTest.kt rename to sentry/src/test/java/io/sentry/SentryTest.kt index 61b579c6f..ca5a83151 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryTest.kt +++ b/sentry/src/test/java/io/sentry/SentryTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/SentryThreadFactoryTest.kt b/sentry/src/test/java/io/sentry/SentryThreadFactoryTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/SentryThreadFactoryTest.kt rename to sentry/src/test/java/io/sentry/SentryThreadFactoryTest.kt index 1fc98bc49..fecec2b9c 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryThreadFactoryTest.kt +++ b/sentry/src/test/java/io/sentry/SentryThreadFactoryTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/SentryValuesTest.kt b/sentry/src/test/java/io/sentry/SentryValuesTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/SentryValuesTest.kt rename to sentry/src/test/java/io/sentry/SentryValuesTest.kt index 63d7dc517..b8d4eb35a 100644 --- a/sentry-core/src/test/java/io/sentry/core/SentryValuesTest.kt +++ b/sentry/src/test/java/io/sentry/SentryValuesTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/SessionTest.kt b/sentry/src/test/java/io/sentry/SessionTest.kt similarity index 98% rename from sentry-core/src/test/java/io/sentry/core/SessionTest.kt rename to sentry/src/test/java/io/sentry/SessionTest.kt index 8c5d29245..ccae83061 100644 --- a/sentry-core/src/test/java/io/sentry/core/SessionTest.kt +++ b/sentry/src/test/java/io/sentry/SessionTest.kt @@ -1,8 +1,8 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.protocol.User +import io.sentry.protocol.User import java.util.Date import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/ShutdownHookIntegrationTest.kt b/sentry/src/test/java/io/sentry/ShutdownHookIntegrationTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/ShutdownHookIntegrationTest.kt rename to sentry/src/test/java/io/sentry/ShutdownHookIntegrationTest.kt index 436b05a91..61c0a90bd 100644 --- a/sentry-core/src/test/java/io/sentry/core/ShutdownHookIntegrationTest.kt +++ b/sentry/src/test/java/io/sentry/ShutdownHookIntegrationTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock diff --git a/sentry-core/src/test/java/io/sentry/core/StringExtensions.kt b/sentry/src/test/java/io/sentry/StringExtensions.kt similarity index 87% rename from sentry-core/src/test/java/io/sentry/core/StringExtensions.kt rename to sentry/src/test/java/io/sentry/StringExtensions.kt index 9543cfea2..e82001814 100644 --- a/sentry-core/src/test/java/io/sentry/core/StringExtensions.kt +++ b/sentry/src/test/java/io/sentry/StringExtensions.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import java.io.ByteArrayInputStream diff --git a/sentry-core/src/test/java/io/sentry/core/UncaughtExceptionHandlerIntegrationTest.kt b/sentry/src/test/java/io/sentry/UncaughtExceptionHandlerIntegrationTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/UncaughtExceptionHandlerIntegrationTest.kt rename to sentry/src/test/java/io/sentry/UncaughtExceptionHandlerIntegrationTest.kt index 7ddc0c0dc..4c5e07c31 100644 --- a/sentry-core/src/test/java/io/sentry/core/UncaughtExceptionHandlerIntegrationTest.kt +++ b/sentry/src/test/java/io/sentry/UncaughtExceptionHandlerIntegrationTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core +package io.sentry import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.argWhere @@ -7,9 +7,9 @@ import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyZeroInteractions import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.exception.ExceptionMechanismException -import io.sentry.core.protocol.SentryId -import io.sentry.core.util.noFlushTimeout +import io.sentry.exception.ExceptionMechanismException +import io.sentry.protocol.SentryId +import io.sentry.util.noFlushTimeout import java.io.File import java.nio.file.Files import kotlin.test.AfterTest diff --git a/sentry-core/src/test/java/io/sentry/core/cache/CacheStrategyTest.kt b/sentry/src/test/java/io/sentry/cache/CacheStrategyTest.kt similarity index 96% rename from sentry-core/src/test/java/io/sentry/core/cache/CacheStrategyTest.kt rename to sentry/src/test/java/io/sentry/cache/CacheStrategyTest.kt index 7eeae9f99..c5692f9b7 100644 --- a/sentry-core/src/test/java/io/sentry/core/cache/CacheStrategyTest.kt +++ b/sentry/src/test/java/io/sentry/cache/CacheStrategyTest.kt @@ -1,11 +1,11 @@ -package io.sentry.core.cache +package io.sentry.cache import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.DateUtils -import io.sentry.core.GsonSerializer -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryOptions -import io.sentry.core.Session +import io.sentry.DateUtils +import io.sentry.GsonSerializer +import io.sentry.SentryEnvelope +import io.sentry.SentryOptions +import io.sentry.Session import java.io.ByteArrayInputStream import java.io.File import java.io.InputStreamReader diff --git a/sentry-core/src/test/java/io/sentry/core/cache/EnvelopeCacheTest.kt b/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt similarity index 92% rename from sentry-core/src/test/java/io/sentry/core/cache/EnvelopeCacheTest.kt rename to sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt index fdfc1cf86..c7b4ac1e8 100644 --- a/sentry-core/src/test/java/io/sentry/core/cache/EnvelopeCacheTest.kt +++ b/sentry/src/test/java/io/sentry/cache/EnvelopeCacheTest.kt @@ -1,21 +1,21 @@ -package io.sentry.core.cache +package io.sentry.cache import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.ILogger -import io.sentry.core.ISerializer -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryLevel -import io.sentry.core.SentryOptions -import io.sentry.core.Session -import io.sentry.core.cache.EnvelopeCache.PREFIX_CURRENT_SESSION_FILE -import io.sentry.core.cache.EnvelopeCache.SUFFIX_CURRENT_SESSION_FILE -import io.sentry.core.hints.SessionEndHint -import io.sentry.core.hints.SessionStartHint -import io.sentry.core.protocol.User +import io.sentry.ILogger +import io.sentry.ISerializer +import io.sentry.SentryEnvelope +import io.sentry.SentryLevel +import io.sentry.SentryOptions +import io.sentry.Session +import io.sentry.cache.EnvelopeCache.PREFIX_CURRENT_SESSION_FILE +import io.sentry.cache.EnvelopeCache.SUFFIX_CURRENT_SESSION_FILE +import io.sentry.hints.SessionEndHint +import io.sentry.hints.SessionStartHint +import io.sentry.protocol.User import java.io.File import java.nio.file.Files import java.nio.file.Path diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/AppTest.kt b/sentry/src/test/java/io/sentry/protocol/AppTest.kt similarity index 98% rename from sentry-core/src/test/java/io/sentry/core/protocol/AppTest.kt rename to sentry/src/test/java/io/sentry/protocol/AppTest.kt index 30c53e5fe..0fb672764 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/AppTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/AppTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import java.util.Date import kotlin.test.Test diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/BrowserTest.kt b/sentry/src/test/java/io/sentry/protocol/BrowserTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/protocol/BrowserTest.kt rename to sentry/src/test/java/io/sentry/protocol/BrowserTest.kt index 2c322e062..feabd36e0 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/BrowserTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/BrowserTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/ContextsTest.kt b/sentry/src/test/java/io/sentry/protocol/ContextsTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/protocol/ContextsTest.kt rename to sentry/src/test/java/io/sentry/protocol/ContextsTest.kt index 2fe525cbc..f265a5467 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/ContextsTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/ContextsTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/DeviceTest.kt b/sentry/src/test/java/io/sentry/protocol/DeviceTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/protocol/DeviceTest.kt rename to sentry/src/test/java/io/sentry/protocol/DeviceTest.kt index bc354be1e..028b9b946 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/DeviceTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/DeviceTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import java.util.Date import java.util.TimeZone diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/GpuTest.kt b/sentry/src/test/java/io/sentry/protocol/GpuTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/protocol/GpuTest.kt rename to sentry/src/test/java/io/sentry/protocol/GpuTest.kt index 91088b465..9614111cc 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/GpuTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/GpuTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/OperatingSystemTest.kt b/sentry/src/test/java/io/sentry/protocol/OperatingSystemTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/protocol/OperatingSystemTest.kt rename to sentry/src/test/java/io/sentry/protocol/OperatingSystemTest.kt index 7ea8606b2..a59b3f43c 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/OperatingSystemTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/OperatingSystemTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/SentryRuntimeTest.kt b/sentry/src/test/java/io/sentry/protocol/SentryRuntimeTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/protocol/SentryRuntimeTest.kt rename to sentry/src/test/java/io/sentry/protocol/SentryRuntimeTest.kt index 2b07f7e83..2389fc843 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/SentryRuntimeTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/SentryRuntimeTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/protocol/UserTest.kt b/sentry/src/test/java/io/sentry/protocol/UserTest.kt similarity index 98% rename from sentry-core/src/test/java/io/sentry/core/protocol/UserTest.kt rename to sentry/src/test/java/io/sentry/protocol/UserTest.kt index 1fd1e8f34..5c52f57b7 100644 --- a/sentry-core/src/test/java/io/sentry/core/protocol/UserTest.kt +++ b/sentry/src/test/java/io/sentry/protocol/UserTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.protocol +package io.sentry.protocol import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/java/io/sentry/core/transport/AsyncConnectionTest.kt b/sentry/src/test/java/io/sentry/transport/AsyncConnectionTest.kt similarity index 95% rename from sentry-core/src/test/java/io/sentry/core/transport/AsyncConnectionTest.kt rename to sentry/src/test/java/io/sentry/transport/AsyncConnectionTest.kt index 0e54785eb..9198dbc48 100644 --- a/sentry-core/src/test/java/io/sentry/core/transport/AsyncConnectionTest.kt +++ b/sentry/src/test/java/io/sentry/transport/AsyncConnectionTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.transport +package io.sentry.transport import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.anyOrNull @@ -9,16 +9,16 @@ import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.CachedEvent -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryEnvelopeHeader -import io.sentry.core.SentryEnvelopeItem -import io.sentry.core.SentryEvent -import io.sentry.core.SentryOptions -import io.sentry.core.Session -import io.sentry.core.cache.IEnvelopeCache -import io.sentry.core.dsnString -import io.sentry.core.protocol.User +import io.sentry.CachedEvent +import io.sentry.SentryEnvelope +import io.sentry.SentryEnvelopeHeader +import io.sentry.SentryEnvelopeItem +import io.sentry.SentryEvent +import io.sentry.SentryOptions +import io.sentry.Session +import io.sentry.cache.IEnvelopeCache +import io.sentry.dsnString +import io.sentry.protocol.User import java.io.IOException import java.util.concurrent.ExecutorService import kotlin.test.Test diff --git a/sentry-core/src/test/java/io/sentry/core/transport/HttpTransportTest.kt b/sentry/src/test/java/io/sentry/transport/HttpTransportTest.kt similarity index 97% rename from sentry-core/src/test/java/io/sentry/core/transport/HttpTransportTest.kt rename to sentry/src/test/java/io/sentry/transport/HttpTransportTest.kt index 2235747db..b7b82b6d3 100644 --- a/sentry-core/src/test/java/io/sentry/core/transport/HttpTransportTest.kt +++ b/sentry/src/test/java/io/sentry/transport/HttpTransportTest.kt @@ -1,16 +1,16 @@ -package io.sentry.core.transport +package io.sentry.transport import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever -import io.sentry.core.ISerializer -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryEvent -import io.sentry.core.SentryOptions -import io.sentry.core.Session -import io.sentry.core.protocol.User +import io.sentry.ISerializer +import io.sentry.SentryEnvelope +import io.sentry.SentryEvent +import io.sentry.SentryOptions +import io.sentry.Session +import io.sentry.protocol.User import java.io.IOException import java.net.HttpURLConnection import java.net.Proxy diff --git a/sentry-core/src/test/java/io/sentry/core/transport/QueuedThreadPoolExecutorTest.kt b/sentry/src/test/java/io/sentry/transport/QueuedThreadPoolExecutorTest.kt similarity index 99% rename from sentry-core/src/test/java/io/sentry/core/transport/QueuedThreadPoolExecutorTest.kt rename to sentry/src/test/java/io/sentry/transport/QueuedThreadPoolExecutorTest.kt index f60612287..db8a85012 100644 --- a/sentry-core/src/test/java/io/sentry/core/transport/QueuedThreadPoolExecutorTest.kt +++ b/sentry/src/test/java/io/sentry/transport/QueuedThreadPoolExecutorTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.transport +package io.sentry.transport import com.nhaarman.mockitokotlin2.mock import java.util.concurrent.CountDownLatch diff --git a/sentry-core/src/test/java/io/sentry/core/transport/StdoutTransportTest.kt b/sentry/src/test/java/io/sentry/transport/StdoutTransportTest.kt similarity index 85% rename from sentry-core/src/test/java/io/sentry/core/transport/StdoutTransportTest.kt rename to sentry/src/test/java/io/sentry/transport/StdoutTransportTest.kt index 5b742a14b..6fa4e1dcd 100644 --- a/sentry-core/src/test/java/io/sentry/core/transport/StdoutTransportTest.kt +++ b/sentry/src/test/java/io/sentry/transport/StdoutTransportTest.kt @@ -1,12 +1,12 @@ -package io.sentry.core.transport +package io.sentry.transport import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.verify -import io.sentry.core.ISerializer -import io.sentry.core.SentryEnvelope -import io.sentry.core.SentryEvent +import io.sentry.ISerializer +import io.sentry.SentryEnvelope +import io.sentry.SentryEvent import kotlin.test.Test import kotlin.test.assertTrue diff --git a/sentry-core/src/test/java/io/sentry/core/util/ApplyScopeUtilsTest.kt b/sentry/src/test/java/io/sentry/util/ApplyScopeUtilsTest.kt similarity index 88% rename from sentry-core/src/test/java/io/sentry/core/util/ApplyScopeUtilsTest.kt rename to sentry/src/test/java/io/sentry/util/ApplyScopeUtilsTest.kt index 1d5fd136d..7b7a774d8 100644 --- a/sentry-core/src/test/java/io/sentry/core/util/ApplyScopeUtilsTest.kt +++ b/sentry/src/test/java/io/sentry/util/ApplyScopeUtilsTest.kt @@ -1,8 +1,8 @@ -package io.sentry.core.util +package io.sentry.util import com.nhaarman.mockitokotlin2.mock -import io.sentry.core.hints.ApplyScopeData -import io.sentry.core.hints.Cached +import io.sentry.hints.ApplyScopeData +import io.sentry.hints.Cached import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/sentry-core/src/test/java/io/sentry/core/util/Extensions.kt b/sentry/src/test/java/io/sentry/util/Extensions.kt similarity index 64% rename from sentry-core/src/test/java/io/sentry/core/util/Extensions.kt rename to sentry/src/test/java/io/sentry/util/Extensions.kt index b4391c4d8..c62b670dc 100644 --- a/sentry-core/src/test/java/io/sentry/core/util/Extensions.kt +++ b/sentry/src/test/java/io/sentry/util/Extensions.kt @@ -1,6 +1,6 @@ -package io.sentry.core.util +package io.sentry.util -import io.sentry.core.SentryOptions +import io.sentry.SentryOptions fun SentryOptions.noFlushTimeout(): SentryOptions { return this.apply { diff --git a/sentry-core/src/test/java/io/sentry/core/util/StringUtilsTest.kt b/sentry/src/test/java/io/sentry/util/StringUtilsTest.kt similarity index 98% rename from sentry-core/src/test/java/io/sentry/core/util/StringUtilsTest.kt rename to sentry/src/test/java/io/sentry/util/StringUtilsTest.kt index 553b443f0..7127a9536 100644 --- a/sentry-core/src/test/java/io/sentry/core/util/StringUtilsTest.kt +++ b/sentry/src/test/java/io/sentry/util/StringUtilsTest.kt @@ -1,4 +1,4 @@ -package io.sentry.core.util +package io.sentry.util import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry-core/src/test/resources/envelope-event-attachment.txt b/sentry/src/test/resources/envelope-event-attachment.txt similarity index 100% rename from sentry-core/src/test/resources/envelope-event-attachment.txt rename to sentry/src/test/resources/envelope-event-attachment.txt diff --git a/sentry-core/src/test/resources/envelope-session-start.txt b/sentry/src/test/resources/envelope-session-start.txt similarity index 100% rename from sentry-core/src/test/resources/envelope-session-start.txt rename to sentry/src/test/resources/envelope-session-start.txt diff --git a/sentry-core/src/test/resources/envelope_session.txt b/sentry/src/test/resources/envelope_session.txt similarity index 100% rename from sentry-core/src/test/resources/envelope_session.txt rename to sentry/src/test/resources/envelope_session.txt diff --git a/sentry-core/src/test/resources/envelope_session_sdkversion.txt b/sentry/src/test/resources/envelope_session_sdkversion.txt similarity index 100% rename from sentry-core/src/test/resources/envelope_session_sdkversion.txt rename to sentry/src/test/resources/envelope_session_sdkversion.txt diff --git a/sentry-core/src/test/resources/event.json b/sentry/src/test/resources/event.json similarity index 100% rename from sentry-core/src/test/resources/event.json rename to sentry/src/test/resources/event.json diff --git a/sentry-core/src/test/resources/event_breadcrumb_data.json b/sentry/src/test/resources/event_breadcrumb_data.json similarity index 100% rename from sentry-core/src/test/resources/event_breadcrumb_data.json rename to sentry/src/test/resources/event_breadcrumb_data.json diff --git a/sentry-core/src/test/resources/event_with_contexts.json b/sentry/src/test/resources/event_with_contexts.json similarity index 100% rename from sentry-core/src/test/resources/event_with_contexts.json rename to sentry/src/test/resources/event_with_contexts.json diff --git a/sentry-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/sentry/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from sentry-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to sentry/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/sentry-core/src/test/resources/session.json b/sentry/src/test/resources/session.json similarity index 100% rename from sentry-core/src/test/resources/session.json rename to sentry/src/test/resources/session.json diff --git a/settings.gradle.kts b/settings.gradle.kts index 1a0c91aa6..4b56a066c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,10 @@ -rootProject.name = "sentry" +rootProject.name = "sentry-root" rootProject.buildFileName = "build.gradle.kts" include("sentry-android", "sentry-android-ndk", "sentry-android-core", - "sentry-core", + "sentry", "sentry-test-support", "sentry-log4j2", "sentry-logback",