diff --git a/.gitignore b/.gitignore index ab0f3b0d..90af866e 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ captures/ .idea/vcs.xml .idea/workspace.xml .idea/protoeditor.xml +.idea/appInsightsSettings.xml *.iml # Keystore files diff --git a/backend-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/FileExt.kt b/backend-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/FileExt.kt index ca59b8af..55575b3b 100644 --- a/backend-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/FileExt.kt +++ b/backend-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/FileExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename", "TooManyFunctions") +@file:Suppress("ktlint:standard:filename", "TooManyFunctions") package cash.z.ecc.android.sdk.internal.ext diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ext/FragmentExt.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ext/FragmentExt.kt index 433e6178..dc049b4a 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ext/FragmentExt.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/ext/FragmentExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.demoapp.ext diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/util/NetworkExt.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/util/NetworkExt.kt index f42c2ee5..28169eb9 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/util/NetworkExt.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/util/NetworkExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.demoapp.util diff --git a/gradle.properties b/gradle.properties index e2b8a21d..2c462c61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -88,13 +88,13 @@ DETEKT_VERSION=1.23.0 DETEKT_COMPOSE_RULES_VERSION=0.2.1 DOKKA_VERSION=1.8.20 EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.12.2 -FLANK_VERSION=23.04.0 +FLANK_VERSION=23.07.0 # When changing this, be sure to change build-conventions/gradle.properties#FOOJAY_TOOLCHAIN_RESOLVER_VERSION too FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.5.0 FULLADLE_VERSION=0.17.4 -GRADLE_VERSIONS_PLUGIN_VERSION=0.46.0 +GRADLE_VERSIONS_PLUGIN_VERSION=0.47.0 KSP_VERSION=1.8.20-1.0.10 -KTLINT_VERSION=0.49.1 +KTLINT_VERSION=0.50.0 PROTOBUF_GRADLE_PLUGIN_VERSION=0.9.4 RUST_GRADLE_PLUGIN_VERSION=0.9.3 @@ -138,7 +138,7 @@ KOTLINX_COROUTINES_VERSION=1.7.3 KOTLINX_DATETIME_VERSION=0.4.0 KOTLIN_VERSION=1.9.10 MOCKITO_KOTLIN_VERSION=2.2.0 -MOCKITO_VERSION=5.3.1 +MOCKITO_VERSION=5.4.0 PROTOC_VERSION=3.24.0 ZCASH_WALLET_PLUGINS_VERSION=1.0.1 diff --git a/sdk-incubator-lib/src/androidTest/kotlin/cash/z/ecc/android/sdk/Iterator.kt b/sdk-incubator-lib/src/androidTest/kotlin/cash/z/ecc/android/sdk/Iterator.kt index dc6b3999..02cd13a2 100644 --- a/sdk-incubator-lib/src/androidTest/kotlin/cash/z/ecc/android/sdk/Iterator.kt +++ b/sdk-incubator-lib/src/androidTest/kotlin/cash/z/ecc/android/sdk/Iterator.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk diff --git a/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/internal/StringExt.kt b/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/internal/StringExt.kt index 7f1974d4..ad81bf2e 100644 --- a/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/internal/StringExt.kt +++ b/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/internal/StringExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.internal diff --git a/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/model/ZatoshiExt.kt b/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/model/ZatoshiExt.kt index 0a697e6f..ee99feff 100644 --- a/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/model/ZatoshiExt.kt +++ b/sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/model/ZatoshiExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.model diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/CursorExt.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/CursorExt.kt index 04d7e0c9..ccfcb21a 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/CursorExt.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/CursorExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.internal.db diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/SQLiteDatabaseExt.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/SQLiteDatabaseExt.kt index 950105d2..60f566c9 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/SQLiteDatabaseExt.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/SQLiteDatabaseExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.internal.db diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/BlockExt.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/BlockExt.kt index 84c4f7ad..4440a8a4 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/BlockExt.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/BlockExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.internal.ext diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/LightWalletEndpointExt.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/LightWalletEndpointExt.kt index 9049c74c..fc275798 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/LightWalletEndpointExt.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/model/LightWalletEndpointExt.kt @@ -1,4 +1,4 @@ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package cash.z.ecc.android.sdk.model