getsentry · bruno-garcia · Sep 10, 2020 · Sep 10, 2020
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ndroid-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/...ndroid-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java b/...ry-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
@@ -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
@@ -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
@@ -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/...y-android-core/src/main/java/io/sentry/android/core/PhoneStateBreadcrumbsIntegration.java b/...y-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
@@ -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
@@ -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
@@ -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/...android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java b/...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;