From ac0fe639198df090db3772f6936a33067258e72b Mon Sep 17 00:00:00 2001 From: Roman Zavarnitsyn Date: Mon, 19 Dec 2022 10:03:52 +0100 Subject: [PATCH 1/2] Replace java.util.Objects with io.sentry.util.Objects --- sentry/src/main/java/io/sentry/ProfilingTransactionData.java | 2 +- .../src/main/java/io/sentry/clientreport/ClientReportKey.java | 2 +- .../java/io/sentry/profilemeasurements/ProfileMeasurement.java | 2 +- .../io/sentry/profilemeasurements/ProfileMeasurementValue.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sentry/src/main/java/io/sentry/ProfilingTransactionData.java b/sentry/src/main/java/io/sentry/ProfilingTransactionData.java index 49787c1969..3591fdd828 100644 --- a/sentry/src/main/java/io/sentry/ProfilingTransactionData.java +++ b/sentry/src/main/java/io/sentry/ProfilingTransactionData.java @@ -1,9 +1,9 @@ package io.sentry; +import io.sentry.util.Objects; import io.sentry.vendor.gson.stream.JsonToken; import java.io.IOException; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/clientreport/ClientReportKey.java b/sentry/src/main/java/io/sentry/clientreport/ClientReportKey.java index c35d38f3fc..a61ec40b47 100644 --- a/sentry/src/main/java/io/sentry/clientreport/ClientReportKey.java +++ b/sentry/src/main/java/io/sentry/clientreport/ClientReportKey.java @@ -1,6 +1,6 @@ package io.sentry.clientreport; -import java.util.Objects; +import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurement.java b/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurement.java index 0e80cbb4a3..912d2657f2 100644 --- a/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurement.java +++ b/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurement.java @@ -6,13 +6,13 @@ import io.sentry.JsonObjectWriter; import io.sentry.JsonSerializable; import io.sentry.JsonUnknown; +import io.sentry.util.Objects; import io.sentry.vendor.gson.stream.JsonToken; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurementValue.java b/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurementValue.java index 79f7a4306a..152003b086 100644 --- a/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurementValue.java +++ b/sentry/src/main/java/io/sentry/profilemeasurements/ProfileMeasurementValue.java @@ -6,10 +6,10 @@ import io.sentry.JsonObjectWriter; import io.sentry.JsonSerializable; import io.sentry.JsonUnknown; +import io.sentry.util.Objects; import io.sentry.vendor.gson.stream.JsonToken; import java.io.IOException; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; From 615c02b7b9c5a1f9cf016bc13ed0e528c791fcd8 Mon Sep 17 00:00:00 2001 From: Roman Zavarnitsyn Date: Mon, 19 Dec 2022 10:09:34 +0100 Subject: [PATCH 2/2] Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96be8c6563..b66b01d6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Fixes + +- Use minSdk compatible `Objects` class ([#2436](https://github.com/getsentry/sentry-java/pull/2436)) + ## 6.10.0 ### Features