From f8288c2daa372a7ebf1ebc76eba6d72f37e8430d Mon Sep 17 00:00:00 2001 From: Konstantin Date: Mon, 23 Dec 2024 10:34:34 +0100 Subject: [PATCH 1/2] fix: send the correct library version for outgoing signals --- README.md | 2 +- RELEASE.md | 7 ++++--- lib/build.gradle.kts | 2 +- .../sdk/providers/EnvironmentParameterProvider.kt | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b20fe7d..43d2b96 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Kotlin SDK for TelemetryDeck is available from Maven Central and can be used ```groovy dependencies { - implementation 'com.telemetrydeck:kotlin-sdk:3.0.3' + implementation 'com.telemetrydeck:kotlin-sdk:3.0.4' } ``` diff --git a/RELEASE.md b/RELEASE.md index bdd2eae..fad346a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,8 +1,9 @@ ## Releasing a new version of the library -1. Update the library coordinates by incrementing the version in https://github.com/TelemetryDeck/KotlinSDK/blob/lib/build.gradle.kts#L103. -2. Update the README.md to instruct new users to use the latest version. -3. Commit and push. +1. Update the library coordinates by incrementing the version in https://github.com/TelemetryDeck/KotlinSDK/blob/lib/build.gradle.kts#L104. +2. Update the `sdkVersion` in `EnvironmentParameterProvider` +3. Update the README.md to instruct new users to use the latest version. +4. Commit and push. ### Publishing using GitHub Actions diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index e682944..2b3849c 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -101,7 +101,7 @@ dependencies { } mavenPublishing { - coordinates("com.telemetrydeck", "kotlin-sdk", "3.0.3") + coordinates("com.telemetrydeck", "kotlin-sdk", "3.0.4") pom { name = "TelemetryDeck SDK" diff --git a/lib/src/main/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProvider.kt b/lib/src/main/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProvider.kt index 31f085b..edde5b3 100644 --- a/lib/src/main/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProvider.kt +++ b/lib/src/main/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProvider.kt @@ -30,6 +30,7 @@ internal class EnvironmentParameterProvider : TelemetryDeckProvider, TelemetryPr private val platform: String = "Android" private val os: String = "Android" private val sdkName: String = "KotlinSDK" + private val sdkVersion: String = "3.0.4" override fun fallbackRegister(ctx: Application?, client: TelemetryDeckSignalProcessor) { register(ctx, client) @@ -49,8 +50,8 @@ internal class EnvironmentParameterProvider : TelemetryDeckProvider, TelemetryPr private fun appendSDKMetadata() { metadata[SDK.Name.paramName] = sdkName - metadata[SDK.Version.paramName] = BuildConfig.LIBRARY_PACKAGE_NAME - metadata[SDK.NameAndVersion.paramName] = "$sdkName ${BuildConfig.LIBRARY_PACKAGE_NAME}" + metadata[SDK.Version.paramName] = sdkVersion + metadata[SDK.NameAndVersion.paramName] = "$sdkName $sdkVersion" metadata[SDK.BuildType.paramName] = BuildConfig.BUILD_TYPE } From 5ddb6a76fc414909364f691ad950eb56a9a5757b Mon Sep 17 00:00:00 2001 From: Konstantin Date: Mon, 23 Dec 2024 11:37:48 +0100 Subject: [PATCH 2/2] fix: tests --- .../com/telemetrydeck/sdk/EnvironmentMetadataProviderTest.kt | 2 +- .../sdk/providers/EnvironmentParameterProviderTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/test/java/com/telemetrydeck/sdk/EnvironmentMetadataProviderTest.kt b/lib/src/test/java/com/telemetrydeck/sdk/EnvironmentMetadataProviderTest.kt index 919b905..5b40ffe 100644 --- a/lib/src/test/java/com/telemetrydeck/sdk/EnvironmentMetadataProviderTest.kt +++ b/lib/src/test/java/com/telemetrydeck/sdk/EnvironmentMetadataProviderTest.kt @@ -25,7 +25,7 @@ class EnvironmentMetadataProviderTest { true ) Assert.assertEquals( - queuedSignal?.payload?.contains("TelemetryDeck.SDK.version:com.telemetrydeck.sdk"), + queuedSignal?.payload?.any { it.startsWith("TelemetryDeck.SDK.version:") }, true ) } diff --git a/lib/src/test/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProviderTest.kt b/lib/src/test/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProviderTest.kt index 49ec13f..5ef9340 100644 --- a/lib/src/test/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProviderTest.kt +++ b/lib/src/test/java/com/telemetrydeck/sdk/providers/EnvironmentParameterProviderTest.kt @@ -24,7 +24,7 @@ class EnvironmentParameterProviderTest { Assert.assertNotNull(queuedSignal) Assert.assertEquals( true, - queuedSignal?.payload?.contains("TelemetryDeck.SDK.version:com.telemetrydeck.sdk") + queuedSignal?.payload?.any { it.startsWith("TelemetryDeck.SDK.version:") } ) }