From c36ba0be8adb543e4a04b7d4451f890df61e88c3 Mon Sep 17 00:00:00 2001 From: Rick Hanton Date: Tue, 11 Mar 2025 11:07:02 -0700 Subject: [PATCH 1/4] Fixes to dependencies for issue #38 & #39 + Kotlin upgrade to 1.8.x --- .github/dependabot.yml | 9 +++++++++ build.gradle.kts | 6 +++--- src/main/kotlin/com/statsig/sdk/Diagnostics.kt | 12 ++++++++++++ .../com/statsig/sdk/network/StatsigTransport.kt | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..4ba3cd28 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" + open-pull-requests-limit: 10 + ignore: + # add items to ignore here diff --git a/build.gradle.kts b/build.gradle.kts index 8e3fd0e5..d3cf285a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ import org.gradle.language.jvm.tasks.ProcessResources import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.6.0" + kotlin("jvm") version "1.8.22" idea id("com.github.johnrengelman.shadow") version "7.1.2" id("org.jlleitschuh.gradle.ktlint") version "11.0.0" @@ -41,7 +41,7 @@ dependencies { implementation("com.google.code.gson:gson:2.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4") - implementation("com.squareup.okhttp3:okhttp:4.11.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") implementation("com.github.ua-parser:uap-java:1.6.1") implementation("com.statsig:ip3country:0.1.5") implementation("com.squareup.okhttp3:logging-interceptor:4.11.0") @@ -49,7 +49,7 @@ dependencies { // GRPC Dependencies implementation("io.grpc:grpc-netty-shaded:1.66.0") implementation("io.grpc:grpc-stub:1.66.0") - implementation("io.grpc:grpc-protobuf:1.66.0") + implementation("io.grpc:grpc-protobuf:1.71.0") implementation("org.apache.tomcat:annotations-api:6.0.53") } diff --git a/src/main/kotlin/com/statsig/sdk/Diagnostics.kt b/src/main/kotlin/com/statsig/sdk/Diagnostics.kt index 1d306bfc..abbc69fc 100644 --- a/src/main/kotlin/com/statsig/sdk/Diagnostics.kt +++ b/src/main/kotlin/com/statsig/sdk/Diagnostics.kt @@ -58,12 +58,18 @@ internal class Diagnostics(private var isDisabled: Boolean, private var logger: marker.idListCount = additionalMarker?.idListCount } } + else -> { + // No additional action needed for other KeyType values + } } when (contextType) { ContextType.API_CALL -> { marker.configName = additionalMarker?.configName marker.markerID = additionalMarker?.markerID } + else -> { + // No additional action needed for other ContextType values + } } if (contextType == ContextType.API_CALL || contextType == ContextType.GET_CLIENT_INITIALIZE_RESPONSE) { marker.markerID = key.name + "_" + (markers?.get(contextType)?.count() ?: 0) @@ -117,6 +123,9 @@ internal class Diagnostics(private var isDisabled: Boolean, private var logger: KeyType.OVERALL -> { marker.reason = additionalMarker?.reason } + else -> { + // No additional action needed for other KeyType values + } } when (contextType) { ContextType.API_CALL -> { @@ -126,6 +135,9 @@ internal class Diagnostics(private var isDisabled: Boolean, private var logger: ContextType.GET_CLIENT_INITIALIZE_RESPONSE -> { marker.markerID = additionalMarker?.markerID } + else -> { + // No additional action needed for other ContextType values + } } this.addMarker(marker, contextType) } diff --git a/src/main/kotlin/com/statsig/sdk/network/StatsigTransport.kt b/src/main/kotlin/com/statsig/sdk/network/StatsigTransport.kt index c99d847c..89eaafed 100644 --- a/src/main/kotlin/com/statsig/sdk/network/StatsigTransport.kt +++ b/src/main/kotlin/com/statsig/sdk/network/StatsigTransport.kt @@ -65,6 +65,9 @@ internal class StatsigTransport( (downloadConfigSpecWorker as GRPCWebsocketWorker).streamingFallback = StreamingFallback(statsigScope, getDcsFn, options.rulesetsSyncIntervalMs) } } + else -> { + // do nothing + } } } From aff8b4cc7cb5a55e47a859a26bb5da1f77d1cf9d Mon Sep 17 00:00:00 2001 From: Rick Hanton Date: Tue, 11 Mar 2025 11:11:39 -0700 Subject: [PATCH 2/4] comment dependabot.yml better --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4ba3cd28..90696fa4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,5 +5,5 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 10 - ignore: - # add items to ignore here +# ignore: +# add items to ignore here From 212fbe558440976edf740ecc8663eace6ac03a76 Mon Sep 17 00:00:00 2001 From: Rick Hanton Date: Tue, 11 Mar 2025 11:23:10 -0700 Subject: [PATCH 3/4] Update other okhttp libs in-sync with main --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d3cf285a..4ad5b951 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ configure { dependencies { protobuf(files("api-interface-definitions/protos/")) testImplementation("junit:junit:4.13.2") - testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0") + testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0") testImplementation("io.mockk:mockk:1.13.2") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") testImplementation("io.grpc:grpc-testing:1.66.0") @@ -44,7 +44,7 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.12.0") implementation("com.github.ua-parser:uap-java:1.6.1") implementation("com.statsig:ip3country:0.1.5") - implementation("com.squareup.okhttp3:logging-interceptor:4.11.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") implementation("org.jetbrains.kotlin:kotlin-reflect") // GRPC Dependencies implementation("io.grpc:grpc-netty-shaded:1.66.0") From da478a87bfb20c17995f9e09cb6e8641255d4cc5 Mon Sep 17 00:00:00 2001 From: Rick Hanton Date: Tue, 11 Mar 2025 11:26:17 -0700 Subject: [PATCH 4/4] Update other grpc libs in-sync with main --- build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4ad5b951..6ded844e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0") testImplementation("io.mockk:mockk:1.13.2") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") - testImplementation("io.grpc:grpc-testing:1.66.0") + testImplementation("io.grpc:grpc-testing:1.71.0") implementation("com.google.code.gson:gson:2.9.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4") @@ -47,8 +47,8 @@ dependencies { implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") implementation("org.jetbrains.kotlin:kotlin-reflect") // GRPC Dependencies - implementation("io.grpc:grpc-netty-shaded:1.66.0") - implementation("io.grpc:grpc-stub:1.66.0") + implementation("io.grpc:grpc-netty-shaded:1.71.0") + implementation("io.grpc:grpc-stub:1.71.0") implementation("io.grpc:grpc-protobuf:1.71.0") implementation("org.apache.tomcat:annotations-api:6.0.53") } @@ -109,7 +109,7 @@ protobuf { } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.66.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.71.0" } } generateProtoTasks {