Merge branch 'main' into fix/manifest-int-values

CHANGELOG.md

@@ -26,6 +26,10 @@
 - Load lazy fields on init in the background ([#3803](https://github.com/getsentry/sentry-java/pull/3803))
 - Replace setOf with HashSet.add ([#3801](https://github.com/getsentry/sentry-java/pull/3801))
 
+### Breaking changes
+
+- The method `addIntegrationToSdkVersion(Ljava/lang/Class;)V` has been removed from the core (`io.sentry:sentry`) package. Please make sure all of the packages (e.g. `io.sentry:sentry-android-core`, `io.sentry:sentry-android-fragment`, `io.sentry:sentry-okhttp`  and others) are all aligned and using the same version to prevent the `NoSuchMethodError` exception.
+
 ## 7.16.0-alpha.1
 
 ### Features

buildSrc/src/main/java/Config.kt

@@ -177,18 +177,17 @@ object Config {
     }
 
     object TestLibs {
-        private val androidxTestVersion = "1.5.0"
         private val espressoVersion = "3.5.0"
 
         val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
         val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-        val androidxCore = "androidx.test:core:$androidxTestVersion"
-        val androidxRunner = "androidx.test:runner:$androidxTestVersion"
-        val androidxTestCoreKtx = "androidx.test:core-ktx:$androidxTestVersion"
-        val androidxTestRules = "androidx.test:rules:$androidxTestVersion"
+        val androidxCore = "androidx.test:core:1.6.1"
+        val androidxRunner = "androidx.test:runner:1.6.2"
+        val androidxTestCoreKtx = "androidx.test:core-ktx:1.6.1"
+        val androidxTestRules = "androidx.test:rules:1.6.1"
         val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
         val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
-        val androidxTestOrchestrator = "androidx.test:orchestrator:1.4.2"
+        val androidxTestOrchestrator = "androidx.test:orchestrator:1.5.0"
         val androidxJunit = "androidx.test.ext:junit:1.1.5"
         val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
         val robolectric = "org.robolectric:robolectric:4.10.3"