Skip to content

Commit 222c9ff

Browse files
authored
Merge bff4562 into f55020d
2 parents f55020d + bff4562 commit 222c9ff

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ class SentryTimberIntegration(
2222
private lateinit var logger: ILogger
2323

2424
override fun register(hub: IHub, options: SentryOptions) {
25-
createSdkVersion(options)
25+
options.sdkVersion?.addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)
26+
2627
logger = options.logger
2728

2829
tree = SentryTimberTree(hub, minEventLevel, minBreadcrumbLevel)
@@ -40,16 +41,4 @@ class SentryTimberIntegration(
4041
}
4142
}
4243
}
43-
44-
private fun createSdkVersion(options: SentryOptions): SdkVersion {
45-
var sdkVersion = options.sdkVersion
46-
47-
val name = SENTRY_TIMBER_SDK_NAME
48-
val version = VERSION_NAME
49-
sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version)
50-
51-
sdkVersion.addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)
52-
53-
return sdkVersion
54-
}
5544
}

sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,9 @@ class SentryTimberIntegrationTest {
9797

9898
assertTrue(
9999
fixture.options.sdkVersion!!.packages!!.any {
100-
it.name == "maven:io.sentry:sentry-android-timber"
101-
it.version == BuildConfig.VERSION_NAME
100+
it.name == "maven:io.sentry:sentry-android-timber" &&
101+
it.version == BuildConfig.VERSION_NAME
102102
}
103103
)
104104
}
105-
106-
@Test
107-
fun `Integration sets SDK name and version to options`() {
108-
val sut = fixture.getSut()
109-
sut.register(fixture.hub, fixture.options)
110-
111-
val sdkVersion = fixture.options.sdkVersion!!
112-
113-
assertEquals(sdkVersion.name, "sentry.java.android.timber")
114-
assertEquals(sdkVersion.version, BuildConfig.VERSION_NAME)
115-
}
116105
}

0 commit comments

Comments
 (0)