diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index e8179f29a..00422de99 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -6,8 +6,6 @@ import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.ResValue -import org.gradle.api.GradleException -import java.io.File import com.android.ddmlib.DdmPreferences import java.io.FileInputStream import java.text.SimpleDateFormat @@ -94,7 +92,6 @@ android { buildTypes { getByName("release") { - isShrinkResources = false isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") signingConfig = signingConfigs.getByName("release") diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckKeysFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckKeysFragment.kt index 5befe8fb6..483c63957 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckKeysFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckKeysFragment.kt @@ -5,6 +5,7 @@ package com.flowcrypt.email.ui.activity.fragment +import android.annotation.SuppressLint import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -83,6 +84,8 @@ class CheckKeysFragment : BaseFragment() { if (!args.isExtraImportOpt) { if (args.skipImportedKeys) { + //todo-denbond7 temporary changes to fix lint warning. Should be improved in future + @SuppressLint("ThreadConstraint") removeAlreadyImportedKeys() } uniqueKeysCount = getCountOfUniqueKeys(keyDetailsAndFingerprintsMap) diff --git a/build.gradle.kts b/build.gradle.kts index fd5e64367..a818bb489 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ apply(from = "$rootDir/ext.gradle.kts") plugins { - id("com.android.application") version "9.1.1" apply false + id("com.android.application") version "9.2.1" apply false id("androidx.navigation.safeargs.kotlin") version "2.9.8" apply false id("com.starter.easylauncher") version "6.4.1" apply false id("org.jetbrains.kotlin.plugin.parcelize") version "2.3.21" apply false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118f7..1a704683a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME