From ca07b322cc4b79c8bb09f2ce464cf53a77ee95e2 Mon Sep 17 00:00:00 2001
From: Xavier Gouchet <xavier.gouchet@gmail.com>
Date: Tue, 25 Jan 2022 09:15:17 +0100
Subject: [PATCH 1/2] Fix merged renamed method in tests

---
 .../internal/domain/scope/RumResourceScopeTest.kt   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt
index c2b162838a..fc03d8b3aa 100644
--- a/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt
+++ b/dd-sdk-android/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt
@@ -846,7 +846,7 @@ internal class RumResourceScopeTest {
             assertThat(lastValue)
                 .apply {
                     hasMessage(message)
-                    hasSource(source)
+                    hasErrorSource(source)
                     hasStackTrace(stackTrace)
                     isCrash(false)
                     hasResource(fakeUrl, fakeMethod, 0L)
@@ -954,7 +954,8 @@ internal class RumResourceScopeTest {
             fakeEventTime,
             fakeAttributes,
             fakeServerOffset,
-            mockDetector
+            mockDetector,
+            mockRumEventSourceProvider
         )
         doAnswer { true }.whenever(mockDetector).isFirstPartyUrl(brokenUrl)
         val attributes = forge.exhaustiveAttributes(excludedKeys = fakeAttributes.keys)
@@ -982,7 +983,7 @@ internal class RumResourceScopeTest {
             assertThat(lastValue)
                 .apply {
                     hasMessage(message)
-                    hasSource(source)
+                    hasErrorSource(source)
                     hasStackTrace(stackTrace)
                     isCrash(false)
                     hasResource(brokenUrl, fakeMethod, 0L)
@@ -1098,7 +1099,7 @@ internal class RumResourceScopeTest {
             assertThat(lastValue)
                 .apply {
                     hasMessage(message)
-                    hasSource(source)
+                    hasErrorSource(source)
                     hasStackTrace(stackTrace)
                     isCrash(false)
                     hasResource(fakeUrl, fakeMethod, 0L)
@@ -1214,7 +1215,7 @@ internal class RumResourceScopeTest {
             assertThat(lastValue)
                 .apply {
                     hasMessage(message)
-                    hasSource(source)
+                    hasErrorSource(source)
                     hasStackTrace(stackTrace)
                     isCrash(false)
                     hasResource(fakeUrl, fakeMethod, 0L)
@@ -1341,7 +1342,7 @@ internal class RumResourceScopeTest {
             assertThat(lastValue)
                 .apply {
                     hasMessage(message)
-                    hasSource(source)
+                    hasErrorSource(source)
                     hasStackTrace(stackTrace)
                     isCrash(false)
                     hasResource(fakeUrl, fakeMethod, statusCode)

From 310b28dcc32c036d22330e07d9197e98abf3a3bc Mon Sep 17 00:00:00 2001
From: Xavier Gouchet <xavier.gouchet@gmail.com>
Date: Mon, 24 Jan 2022 19:14:35 +0100
Subject: [PATCH 2/2] :bookmark: Bump to version 1.12.0-alpha1

---
 .../src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
index 1509d9cc3a..c8c6c89a67 100644
--- a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
+++ b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
@@ -17,7 +17,7 @@ object AndroidConfig {
     const val MIN_SDK_FOR_COMPOSE = 21
     const val BUILD_TOOLS_VERSION = "31.0.0"
 
-    val VERSION = Version(1, 12, 0, Version.Type.Dev)
+    val VERSION = Version(1, 12, 0, Version.Type.Alpha(1))
 }
 
 @Suppress("UnstableApiUsage")