Merge pull request #827 from DataDog/xgouchet/RUMM-1930/prepare_alpha…

…-1.12.0 Bump to version 1.12.0-alpha1
DataDog · Jan 25, 2022 · e493041 · e493041
2 parents 78531f2 + 310b28d
commit e493041
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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")

diff --git a/...oid/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumResourceScopeTest.kt b/...oid/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)