diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt index 947d3773f..7b0de5122 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt @@ -164,11 +164,9 @@ class TestWallet( } } - // TODO [843]: Ktlint 0.48.1 (remove this suppress) - // TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843 - @Suppress("ktlint:no-semi") enum class Backups(val seedPhrase: String, val testnetBirthday: BlockHeight, val mainnetBirthday: BlockHeight) { - // TODO: get the proper birthday values for these wallets + // TODO: [#902] Get the proper birthday values for test wallets + // TODO: [#902] https://github.com/zcash/zcash-android-wallet-sdk/issues/902 DEFAULT( "column rhythm acoustic gym cost fit keen maze fence seed mail medal shrimp tell relief clip cannon foster soldier shallow refuse lunar parrot banana", BlockHeight.new( @@ -208,6 +206,6 @@ class TestWallet( 1_330_190 ), BlockHeight.new(ZcashNetwork.Mainnet, 1_000_000) - ); + ) } } diff --git a/gradle.properties b/gradle.properties index af4717cae..377f683b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.0.15 FLANK_VERSION=23.01.0 FULLADLE_VERSION=0.17.4 GRADLE_VERSIONS_PLUGIN_VERSION=0.44.0 -KTLINT_VERSION=0.48.0 +KTLINT_VERSION=0.48.2 KSP_VERSION=1.8.0-1.0.8 PROTOBUF_GRADLE_PLUGIN_VERSION=0.8.19 RUST_GRADLE_PLUGIN_VERSION=0.9.3 diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt index 44933b641..0e64e9b8f 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt @@ -166,11 +166,9 @@ class TestWallet( } } - // TODO [843]: Ktlint 0.48.1 (remove this suppress) - // TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843 - @Suppress("ktlint:no-semi") enum class Backups(val seedPhrase: String, val testnetBirthday: BlockHeight, val mainnetBirthday: BlockHeight) { - // TODO: get the proper birthday values for these wallets + // TODO: [#902] Get the proper birthday values for test wallets + // TODO: [#902] https://github.com/zcash/zcash-android-wallet-sdk/issues/902 DEFAULT( "column rhythm acoustic gym cost fit keen maze fence seed mail medal shrimp tell relief clip cannon foster soldier shallow refuse lunar parrot banana", BlockHeight.new( @@ -210,6 +208,6 @@ class TestWallet( 1_330_190 ), BlockHeight.new(ZcashNetwork.Mainnet, 1_000_000) - ); + ) } } diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ConsensusBranchId.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ConsensusBranchId.kt index 45908752b..7b51263b2 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ConsensusBranchId.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ConsensusBranchId.kt @@ -7,9 +7,7 @@ import java.util.Locale * omitted since this is not the source of truth for branch information but rather a tool for * printing that information to users. */ -// TODO [843]: Ktlint 0.48.1 (remove this suppress) -// TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843 -@Suppress("MagicNumber", "ktlint:no-semi") +@Suppress("MagicNumber") enum class ConsensusBranchId(val displayName: String, val id: Long, val hexId: String) { // TODO [#679]: see if we can find a way to not rely on this separate source of truth (either stop converting from // hex to display name in the apps or use Rust to get this info)