Skip to content

Conversation

@markushi
Copy link
Member

@markushi markushi commented Nov 19, 2024

Unfortunately the spotless plugin wasn't applied correctly, so the Java/Kotlin code formatting was incorrect. This PR fixes the mentioned issues and provides a Makefile within the ndk folder, giving us an easy to use make all command.

#skip-changelog

@markushi markushi requested a review from supervacuus November 19, 2024 10:44
Copy link
Collaborator

@supervacuus supervacuus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spotless 😅

@codecov
Copy link

codecov bot commented Nov 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.32%. Comparing base (113d261) to head (7723c44).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1081      +/-   ##
==========================================
- Coverage   82.41%   82.32%   -0.10%     
==========================================
  Files          53       53              
  Lines        7752     7752              
  Branches     1216     1216              
==========================================
- Hits         6389     6382       -7     
- Misses       1252     1257       +5     
- Partials      111      113       +2     
---- 🚨 Try these New Features:

@supervacuus
Copy link
Collaborator

Unfortunately the spotless plugin wasn't applied correctly, so the Java/Kotlin code formatting was incorrect. This PR fixes the mentioned issues and provides a Makefile within the ndk folder, giving us an easy to use make all command.

just one question: this only affects sentry-android major 7, right? For 8 sentry-android no longer cares how spotless the ndk folder is, right?

@markushi
Copy link
Member Author

Unfortunately the spotless plugin wasn't applied correctly, so the Java/Kotlin code formatting was incorrect. This PR fixes the mentioned issues and provides a Makefile within the ndk folder, giving us an easy to use make all command.

just one question: this only affects sentry-android major 7, right? For 8 sentry-android no longer cares how spotless the ndk folder is, right?

This change affects none of them, as 7.x isn't using the ndk folder at all (it pulls in an compiles sentry-native directly), and 8.x consumes the pre-built maven artifact.

So the main motivation is to make future changes within the ndk folder easier and more consistent 😊

@markushi markushi merged commit d8230a8 into master Nov 19, 2024
24 checks passed
@markushi markushi deleted the chore/code-formatting branch November 19, 2024 12:03
@supervacuus
Copy link
Collaborator

change affects none of them, as 7.x isn't using the ndk folder at all (it pulls in an compiles sentry-native directly)

I understand that, but was it a 7.x build where spotless "saw" the ndk subfolder from the sentry-native submodule that revealed mis-formatted code?

@markushi
Copy link
Member Author

change affects none of them, as 7.x isn't using the ndk folder at all (it pulls in an compiles sentry-native directly)

I understand that, but was it a 7.x build where spotless "saw" the ndk subfolder from the sentry-native submodule that revealed mis-formatted code?

Ah I see, 7.x.x simply ignores the whole sentry-native folder: https://github.com/getsentry/sentry-java/blob/3d24791bd1b80d3dbf8a849d9f23bf14445902c9/build.gradle.kts#L229

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants