Skip to content

Commit d3b29ed

Browse files
ref(android): Remove deprecated io.sentry.android.core.LoadClass (#6594)
* ref(android): Remove deprecated io.sentry.android.core.LoadClass Use io.sentry.util.LoadClass instead. The Android shim was deprecated in Co-Authored-By: Alexander Dinauer <alexander.dinauer@sentry.io> #3460 and nothing in the SDK uses it anymore. * changelog Co-Authored-By: Alexander Dinauer <alexander.dinauer@sentry.io> --------- Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com> Co-authored-by: Alexander Dinauer <alexander.dinauer@sentry.io>
1 parent 4066c5e commit d3b29ed

12 files changed

Lines changed: 16 additions & 54 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
### Breaking Changes
1111

12+
- Remove the deprecated `io.sentry.android.core.LoadClass`. Use `io.sentry.util.LoadClass` instead ([#6594](https://github.com/getsentry/sentry-java/pull/6594))
1213
- `SentryOptions.getIgnoredErrors()`, `getIgnoredTransactions()`, `getIgnoredCheckIns()` and `getIgnoredSpanOrigins()` now return `List<String>` instead of `List<FilterString>`, matching their setters ([#6489](https://github.com/getsentry/sentry-java/pull/6489))
1314
- The SDK is now compiled for Java 11 instead of Java 8. JVM applications need Java 11 or newer ([#6459](https://github.com/getsentry/sentry-java/pull/6459))
1415
- Default trace context status to `ok` when an active span has no explicit status ([#6418](https://github.com/getsentry/sentry-java/pull/6418))

‎sentry-android-core/api/sentry-android-core.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,6 @@ public final class io/sentry/android/core/InternalSentrySdk {
321321
public static fun updateSessionForDroppedEventNonTerminating (Z)V
322322
}
323323

324-
public final class io/sentry/android/core/LoadClass : io/sentry/util/LoadClass {
325-
public fun <init> ()V
326-
public fun isClassAvailable (Ljava/lang/String;Lio/sentry/ILogger;)Z
327-
public fun isClassAvailable (Ljava/lang/String;Lio/sentry/SentryOptions;)Z
328-
public fun loadClass (Ljava/lang/String;Lio/sentry/ILogger;)Ljava/lang/Class;
329-
}
330-
331324
public final class io/sentry/android/core/MemoryLimiterIntegration : io/sentry/Integration, java/io/Closeable {
332325
public fun <init> (Landroid/content/Context;Lio/sentry/android/core/BuildInfoProvider;)V
333326
public fun close ()V

‎sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import io.sentry.transport.NoOpEnvelopeCache;
5757
import io.sentry.transport.NoOpTransportGate;
5858
import io.sentry.util.LazyEvaluator;
59+
import io.sentry.util.LoadClass;
5960
import io.sentry.util.Objects;
6061
import io.sentry.util.thread.NoOpThreadChecker;
6162
import java.io.File;
@@ -149,7 +150,7 @@ static void loadDefaultAndMetadataOptions(
149150
static void initializeIntegrationsAndProcessors(
150151
final @NotNull SentryAndroidOptions options,
151152
final @NotNull Context context,
152-
final @NotNull io.sentry.util.LoadClass loadClass,
153+
final @NotNull LoadClass loadClass,
153154
final boolean isReplayAvailable) {
154155
initializeIntegrationsAndProcessors(
155156
options, context, new BuildInfoProvider(new AndroidLogger()), loadClass, isReplayAvailable);
@@ -159,7 +160,7 @@ static void initializeIntegrationsAndProcessors(
159160
final @NotNull SentryAndroidOptions options,
160161
final @NotNull Context context,
161162
final @NotNull BuildInfoProvider buildInfoProvider,
162-
final @NotNull io.sentry.util.LoadClass loadClass,
163+
final @NotNull LoadClass loadClass,
163164
final boolean isReplayAvailable) {
164165

165166
if (options.getCacheDirPath() != null
@@ -406,7 +407,7 @@ static void installDefaultIntegrations(
406407
final @NotNull Context context,
407408
final @NotNull SentryAndroidOptions options,
408409
final @NotNull BuildInfoProvider buildInfoProvider,
409-
final @NotNull io.sentry.util.LoadClass loadClass,
410+
final @NotNull LoadClass loadClass,
410411
final boolean isFragmentAvailable,
411412
final boolean isTimberAvailable,
412413
final boolean isReplayAvailable,

‎sentry-android-core/src/main/java/io/sentry/android/core/LoadClass.java‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.sentry.android.fragment.FragmentLifecycleIntegration;
1919
import io.sentry.android.timber.SentryTimberIntegration;
2020
import io.sentry.util.AutoClosableReentrantLock;
21+
import io.sentry.util.LoadClass;
2122
import java.lang.reflect.InvocationTargetException;
2223
import java.util.ArrayList;
2324
import java.util.List;
@@ -101,7 +102,7 @@ public static void init(
101102
Sentry.init(
102103
new SentryAndroidOptionsContainer(),
103104
options -> {
104-
final io.sentry.util.LoadClass classLoader = new io.sentry.util.LoadClass();
105+
final LoadClass classLoader = new LoadClass();
105106
final boolean isTimberUpstreamAvailable =
106107
classLoader.isClassAvailable(TIMBER_CLASS_NAME, options);
107108
final boolean isFragmentUpstreamAvailable =
@@ -119,7 +120,7 @@ public static void init(
119120
classLoader.isClassAvailable(SENTRY_DISTRIBUTION_INTEGRATION_CLASS_NAME, options);
120121

121122
final BuildInfoProvider buildInfoProvider = new BuildInfoProvider(logger);
122-
final io.sentry.util.LoadClass loadClass = new io.sentry.util.LoadClass();
123+
final LoadClass loadClass = new LoadClass();
123124

124125
AndroidOptionsInitializer.loadDefaultAndMetadataOptions(
125126
options, context, logger, buildInfoProvider);

‎sentry-android-core/src/main/java/io/sentry/android/core/UserInteractionIntegration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.sentry.android.core.internal.gestures.NoOpWindowCallback;
1616
import io.sentry.android.core.internal.gestures.SentryGestureListener;
1717
import io.sentry.android.core.internal.gestures.SentryWindowCallback;
18+
import io.sentry.util.LoadClass;
1819
import io.sentry.util.Objects;
1920
import java.io.Closeable;
2021
import java.io.IOException;
@@ -44,7 +45,7 @@ public final class UserInteractionIntegration
4445
private final @NotNull Object wrappedWindowsLock = new Object();
4546

4647
public UserInteractionIntegration(
47-
final @NotNull Application application, final @NotNull io.sentry.util.LoadClass classLoader) {
48+
final @NotNull Application application, final @NotNull LoadClass classLoader) {
4849
this.application = Objects.requireNonNull(application, "Application is required");
4950
isAndroidxLifecycleAvailable =
5051
classLoader.isClassAvailable("androidx.lifecycle.Lifecycle", options);

‎sentry-android-core/src/test/java/io/sentry/android/core/AndroidContinuousProfilerTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import io.sentry.android.core.internal.util.SentryFrameMetricsCollector
1919
import io.sentry.profilemeasurements.ProfileMeasurement
2020
import io.sentry.test.DeferredExecutorService
2121
import io.sentry.test.getProperty
22+
import io.sentry.util.LoadClass
2223
import java.io.File
2324
import java.util.concurrent.Future
2425
import kotlin.test.AfterTest

‎sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import io.sentry.internal.modules.IModulesLoader
3939
import io.sentry.protocol.SentryId
4040
import io.sentry.test.ImmediateExecutorService
4141
import io.sentry.transport.ITransportGate
42+
import io.sentry.util.LoadClass
4243
import io.sentry.util.thread.IThreadChecker
4344
import java.io.File
4445
import kotlin.test.BeforeTest

‎sentry-android-core/src/test/java/io/sentry/android/core/AndroidProfilerTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import io.sentry.profilemeasurements.ProfileMeasurement
1313
import io.sentry.test.getCtor
1414
import io.sentry.test.getProperty
1515
import io.sentry.util.LazyEvaluator
16+
import io.sentry.util.LoadClass
1617
import java.io.File
1718
import java.util.concurrent.Callable
1819
import java.util.concurrent.Future

‎sentry-android-core/src/test/java/io/sentry/android/core/AndroidTransactionProfilerTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.sentry.android.core.internal.util.SentryFrameMetricsCollector
1616
import io.sentry.profilemeasurements.ProfileMeasurement
1717
import io.sentry.test.getCtor
1818
import io.sentry.test.getProperty
19+
import io.sentry.util.LoadClass
1920
import java.io.File
2021
import java.util.concurrent.Callable
2122
import java.util.concurrent.Future

0 commit comments

Comments
 (0)