Merge branch 'main' into rz/perf/single-lifecycle-observer

Author: romtsn

CHANGELOG.md

@@ -13,6 +13,13 @@
 - Deduplicate battery breadcrumbs ([#4561](https://github.com/getsentry/sentry-java/pull/4561))
 - Remove unused method in ManifestMetadataReader ([#4585](https://github.com/getsentry/sentry-java/pull/4585))
 - Have single `NetworkCallback` registered at a time to reduce IPC calls ([#4562](https://github.com/getsentry/sentry-java/pull/4562))
+- Limit ProGuard keep rules for native methods within `sentry-android-ndk` to the `io.sentry.**` namespace. ([#4427](https://github.com/getsentry/sentry-java/pull/4427))
+  - If you relied on the Sentry SDK to keep native method names for JNI compatibility within your namespace, please review your ProGuard rules and ensure the configuration still works. Especially when you're not consuming any of the default Android proguard rules (`proguard-android.txt` or `proguard-android-optimize.txt`) the following config should be present:
+  ```
+  -keepclasseswithmembernames class * {
+    native <methods>;
+  }
+  ```
 
 ## 8.18.0
 

scripts/update-gradle.sh

@@ -32,10 +32,6 @@ set-version)
         version="${version:1}"
     fi
 
-    # Remove trailing ".0" - gradlew expects '7.1' instead of '7.1.0'
-    if [[ "$version" == *".0" ]]; then
-        version="${version:0:${#version}-2}"
-    fi
     echo "Setting gradle version to '$version'"
 
     # This sets version to gradle-wrapper.properties.

sentry-android-ndk/proguard-rules.pro

@@ -7,7 +7,7 @@
 -keep class io.sentry.protocol.DebugImage { *; }
 
 # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
--keepclasseswithmembernames,includedescriptorclasses class * {
+-keepclasseswithmembernames,includedescriptorclasses class io.sentry.** {
     native <methods>;
 }