Merge pull request #1839 from DataDog/xgouchet/prepare_2.5.1

xgouchet · web-flow · commit 8a44f372c426 · 2024-01-24T15:48:30.000+01:00
Prepare 2.5.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.5.1 / 2024-01-24
+
+* [BUGFIX] RUM: Prevent crash due to concurrent modification of custom attributes. See [#1838](https://github.com/DataDog/dd-sdk-android/pull/1838)
+
 # 2.5.0 / 2024-01-15
 
 * [FEATURE] Add accessor for current session id. See [#1810](https://github.com/DataDog/dd-sdk-android/pull/1810)
diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
@@ -19,7 +19,7 @@ object AndroidConfig {
     const val MIN_SDK_FOR_WEAR = 23
     const val BUILD_TOOLS_VERSION = "34.0.0"
 
-    val VERSION = Version(2, 5, 0, Version.Type.Release)
+    val VERSION = Version(2, 5, 1, Version.Type.Release)
 }
 
 // TODO RUM-628 Switch to Java 17 bytecode

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ object AndroidConfig {`
`19`	`19`	`const val MIN_SDK_FOR_WEAR = 23`
`20`	`20`	`const val BUILD_TOOLS_VERSION = "34.0.0"`
`21`	`21`
`22`		`- val VERSION = Version(2, 5, 0, Version.Type.Release)`
	`22`	`+ val VERSION = Version(2, 5, 1, Version.Type.Release)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`// TODO RUM-628 Switch to Java 17 bytecode`