From 59bf4cbc57c80d871333b7b3ee1250d49b7ffda2 Mon Sep 17 00:00:00 2001 From: pandeymangg Date: Mon, 26 May 2025 12:55:45 +0700 Subject: [PATCH 1/2] fixes blackduck issues --- android/build.gradle.kts | 4 ---- gradle/libs.versions.toml | 14 ++++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 9f0b6d1..d7d5662 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -11,9 +11,6 @@ plugins { id("org.sonarqube") version "4.4.1.3373" } -// Import JaCoCo configuration -// apply(from = "../jacoco.gradle.kts") - version = "1.0.2" val groupId = "com.formbricks" val artifactId = "android" @@ -86,7 +83,6 @@ dependencies { implementation(libs.material) implementation(libs.kotlinx.serialization.json) - implementation(libs.androidx.legacy.support.v4) implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.fragment.ktx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 08f2ef2..35174a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,13 +14,12 @@ androidx-annotation = "1.9.1" kotlinx-serialization-json = "1.8.0" -retrofit = "2.11.0" -okhttp3 = "4.11.0" -gson = "2.10.1" -legacySupportV4 = "1.0.0" -lifecycleLivedataKtx = "2.8.7" -lifecycleViewmodelKtx = "2.8.7" -fragmentKtx = "1.8.6" +retrofit = "3.0.0" +okhttp3 = "4.12.0" +gson = "2.13.1" +lifecycleLivedataKtx = "2.9.0" +lifecycleViewmodelKtx = "2.9.0" +fragmentKtx = "1.8.7" databindingCommon = "8.9.2" [libraries] @@ -39,7 +38,6 @@ okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-intercept gson = { module = "com.google.code.gson:gson", version.ref = "gson" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } -androidx-legacy-support-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupportV4" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" } androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" } androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" } From ad51e450f17a3f5fcdef8f6231f16b52b2c4182d Mon Sep 17 00:00:00 2001 From: pandeymangg Date: Mon, 26 May 2025 17:18:19 +0700 Subject: [PATCH 2/2] fix: dokka version --- android/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index d7d5662..27cbc17 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("android") kotlin("kapt") kotlin("plugin.serialization") version "2.1.0" - id("org.jetbrains.dokka") version "1.9.10" + id("org.jetbrains.dokka") version "1.9.20" id("jacoco") id("com.vanniktech.maven.publish") version "0.31.0" id("org.sonarqube") version "4.4.1.3373"