Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
> - Java 8 support will be dropped. SDK 9.0.0 requires Java 11+. See [#6469](https://github.com/getsentry/sentry-java/issues/6469).
> - The Android `minSdk` will be raised from 21 to 24. See [#5508](https://github.com/getsentry/sentry-java/issues/5508).

## Unreleased

### Fixes

- Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558))

## 8.65.0

### Features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public boolean isSplitApks() {
return isSplitApks;
}

public @Nullable String[] getSplitNames() {
public String @Nullable [] getSplitNames() {
return splitNames;
}
}
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/Attachment.java
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public Attachment(
*
* @return the bytes.
*/
public @Nullable byte[] getBytes() {
public byte @Nullable [] getBytes() {
return bytes;
}

Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/cache/tape/QueueFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ private void setLength(long newLength) throws IOException {
}

/** Reads the eldest element. Returns null if the queue is empty. */
public @Nullable byte[] peek() throws IOException {
public byte @Nullable [] peek() throws IOException {
if (closed) throw new IllegalStateException("closed");
if (isEmpty()) return null;
int length = first.length;
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/protocol/Device.java
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public void setTimezone(final @Nullable TimeZone timezone) {
this.timezone = timezone;
}

public @Nullable String[] getArchs() {
public String @Nullable [] getArchs() {
return archs;
}

Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/protocol/Spring.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public Spring(final @NotNull Spring spring) {
this.unknown = CollectionUtils.newConcurrentHashMap(spring.unknown);
}

public @Nullable String[] getActiveProfiles() {
public String @Nullable [] getActiveProfiles() {
return activeProfiles;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class JsonSerializationUtils {
return list;
}

public static @Nullable byte[] bytesFrom(
public static byte @Nullable [] bytesFrom(
final @NotNull ISerializer serializer,
final @NotNull ILogger logger,
final @NotNull JsonSerializable serializable) {
Expand Down
Loading